summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* apply some css changesredesign_labels_pageArinde Eniola2016-04-061-4/+1
|
* fix the failing tests and some changesArinde Eniola2016-04-064-14/+18
|
* finish up the design and add info to the changelogArinde Eniola2016-04-064-8/+15
|
* make the view responsive for extra small deviceArinde Eniola2016-04-061-0/+20
|
* set the width to the elementsArinde Eniola2016-04-061-2/+3
|
* change the subscribe, delete and edit buttons to iconsArinde Eniola2016-04-063-8/+42
|
* Merge branch 'dropdown-enter-select-fix' into 'master' Jacob Schatz2016-04-061-1/+1
|\ | | | | | | | | | | | | Fixed issue with enter key not selecting correct value in dropdown See merge request !3563
| * Fixed issue with enter key not selecting correct value in dropdowndropdown-enter-select-fixPhil Hughes2016-04-061-1/+1
| |
* | Merge branch 'delete-icon-color' into 'master' Jacob Schatz2016-04-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixed delete comment button color ![Screen_Shot_2016-04-06_at_09.55.38](/uploads/526c03db67b0fc7dc9876439f4be2b6b/Screen_Shot_2016-04-06_at_09.55.38.png) See merge request !3562
| * | Fixed delete comment button colordelete-icon-colorPhil Hughes2016-04-061-1/+1
| |/
* | Merge branch '14342-merge-button' into 'master' Jacob Schatz2016-04-061-6/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update shades of red Closes #14342 Before: ![Screen_Shot_2016-04-05_at_12.11.44_PM](/uploads/58cf841fe9527a222bcf70c64f93e2fc/Screen_Shot_2016-04-05_at_12.11.44_PM.png) Fixed: ![Screen_Shot_2016-04-05_at_12.10.56_PM](/uploads/98358b6a20aaee2ca777eee87075085e/Screen_Shot_2016-04-05_at_12.10.56_PM.png) See merge request !3549
| * | Update shades of red14342-merge-buttonAnnabel Dunstone2016-04-051-6/+6
| | |
* | | Merge branch 'fix_missing_filters_on_status_tab_change' into 'master' Jacob Schatz2016-04-063-0/+165
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing filters on status tab when user swithches to another state closes #14769 ![fixi](/uploads/7733ec714b70b2157104af4b039953c3/fixi.gif) See merge request !3482
| * | | complete the testsfix_missing_filters_on_status_tab_changeArinde Eniola2016-04-061-1/+75
| | | |
| * | | set up test for preventing this issue from reoccuringArinde Eniola2016-04-061-0/+45
| | | |
| * | | attach the utitlity function to the global scope with some changesArinde Eniola2016-04-023-35/+33
| | | |
| * | | fix missing filters on status tab when user swithches to another stateArinde Eniola2016-04-022-0/+48
| | | |
* | | | Merge branch 'metrics-measure-block' into 'master' Robert Speicher2016-04-064-3/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for measuring Ruby blocks using GitLab performance monitoring This adds support for measuring timings of arbitrary Ruby blocks. Fixes #14710 See merge request !3515
| * | | | Added dev guide for measuring Ruby blocksmetrics-measure-blockYorick Peterse2016-04-062-0/+38
| | | | |
| * | | | Measure Ruby blocks using Gitlab::MetricsYorick Peterse2016-04-062-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows measuring of timings of arbitrary Ruby blocks, this allows for more fine grained performance monitoring. Custom values and tags can also be attached to a block.
| * | | | Corrected some spec headers for Gitlab::MetricsYorick Peterse2016-04-061-3/+3
| | |_|/ | |/| |
* | | | Merge branch 'api-user-location' into 'master' Rémy Coutable2016-04-064-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose user location in API * Closes #14720 See merge request !3558
| * | | | Expose user location in APIRobert Schilling2016-04-064-3/+12
| | | | |
* | | | | Merge branch ↵Rémy Coutable2016-04-063-6/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'buildsemailservice-should-filter-out-blank-email-addresses-14883' into 'master' Ensure empty recipients are rejected in BuildsEmailService Fixes #14883. See merge request !3543
| * | | | | Ensure empty recipients are rejected in BuildsEmailServiceRémy Coutable2016-04-063-6/+30
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'ci-tags' into 'master' Kamil Trzciński2016-04-061-76/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise .gitlab-ci.yml Not sure who should I assign. See merge request !3542
| * | | | Optimise .gitlab-ci.ymlKamil Trzcinski2016-04-061-76/+0
|/ / / /
* | | | Merge branch 'feature/margin-bottom-for-empty-repos' into 'master' Jeroen van Baarsen2016-04-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bottom margin to CLI instructions The CLI instructions block in the empty project page is missing a margin-bottom style property. I added it, you can review the only line I edited to add this. This only fixes a UX bug (to me), related to the "Remove project" button that is not correctly padded. Now I believe that part look better :) I attach screenshots. ### before ![Selezione_009](/uploads/f46b2a26c192a0b1994ff2f037f50e6c/Selezione_009.png) ### after ![Selezione_008](/uploads/33a9451bbe8bfd9abd300f9c6eb4005f/Selezione_008.png) See merge request !3505
| * | | | Added bottom margin to CLI instructionsAlessio Biancalana2016-04-021-1/+1
| | |/ / | |/| |
* | | | Merge branch 'api-retrieve-tag' into 'master' Jeroen van Baarsen2016-04-064-1/+65
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to retrieve a single tag * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14330 /cc @dblessing See merge request !3567
| * | | API: Ability to retrieve a single tagRobert Schilling2016-04-064-1/+65
|/ / /
* | | Merge branch '14942-last-commit-styling' into 'master' Jacob Schatz2016-04-062-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI styling to all CI updates Fixes #14942 Correct styling for last commit: ![Screen_Shot_2016-04-05_at_2.17.54_PM](/uploads/8cbda0023eaf7a26b776f3da58050e1a/Screen_Shot_2016-04-05_at_2.17.54_PM.png) See merge request !3554
| * | | Add CI styling to all CI updates14942-last-commit-stylingAnnabel Dunstone2016-04-052-2/+2
| | | |
* | | | Merge branch 'fix-project-path-rename' into 'master' Stan Hu2016-04-053-1/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 after renaming a project path Renaming the path of a project would result in an Error 500 due to `@repository` being memoized with the old path. An Error 500 would result: ``` Started GET "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:30 +0000 Processing by ProjectsController#show as HTML Parameters: {"namespace_id"=>"testing2", "id"=>"test1"} Completed 200 OK in 637ms (Views: 194.2ms | ActiveRecord: 111.8ms) Started GET "/testing2/test1/edit" for 127.0.0.1 at 2016-04-04 12:42:33 +0000 Processing by ProjectsController#edit as HTML Parameters: {"namespace_id"=>"testing2", "id"=>"test1"} Completed 200 OK in 594ms (Views: 183.8ms | ActiveRecord: 87.4ms) Started PATCH "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:41 +0000 Processing by ProjectsController#update as HTML Parameters: {"utf8"=>"✓", "authenticity_token"=>"[FILTERED]", "project"=>{"nam e"=>"test123", "path"=>"test123"}, "namespace_id"=>"testing2", "id"=>"test1"} Completed 500 Internal Server Error in 1852ms (ActiveRecord: 124.0ms) ActionView::Template::Error (no repository for such path): 2: %legend 3: Builds: 4: 5: - unless @repository.gitlab_ci_yml 6: .form-group 7: .col-sm-offset-2.col-sm-10 8: %p Builds need to be configured before you can begin using Contin uous Integration. app/models/repository.rb:59:in `block in empty?' lib/repository_cache.rb:19:in `fetch' app/models/repository.rb:59:in `empty?' app/models/repository.rb:471:in `gitlab_ci_yml' app/views/projects/_builds_settings.html.haml:5:in `_app_views_projects__build s_settings_html_haml__782034335636359229_73397600' app/views/projects/edit.html.haml:87:in `block in _app_views_projects_edit_htm l_haml___2388082585934859365_47390860' app/views/projects/edit.html.haml:8:in `_app_views_projects_edit_html_haml___2 388082585934859365_47390860' app/controllers/projects_controller.rb:54:in `block (2 levels) in update' app/controllers/projects_controller.rb:43:in `update' lib/gitlab/middleware/go.rb:16:in `call' ``` Closes #14885 See merge request !3528
| * | | | Fix Error 500 after renaming a project pathStan Hu2016-04-053-1/+27
| | | | | | | | | | | | | | | | | | | | Closes #14885
* | | | | Merge branch 'rs-fix-gmail-actions' into 'master' Robert Speicher2016-04-052-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Premailer shouldn't remove script tags from our emails Closes #14943. See merge request !3552
| * | | | | Premailer shouldn't remove script tags from our emailsRobert Speicher2016-04-052-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Closes #14943.
* | | | | | Update CHANGELOG for 8.3.5 and 8.3.6Robert Speicher2016-04-051-0/+6
| |_|/ / / |/| | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'close-issue-bug' into 'master' Jacob Schatz2016-04-052-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix data check in update issue response See merge request !3548
| * | | | Update issue_spec testclose-issue-bugAnnabel Dunstone2016-04-051-3/+3
| | | | |
| * | | | Fix data check in update issue responseAnnabel Dunstone2016-04-051-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'dropdown-arrow-support' into 'master' Jacob Schatz2016-04-051-18/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown arrow support When the dropdown is open, you can scroll through the list of items with the up & down arrow keys. When an item is focused, the enter triggers the click event for that row. Closes #14455 See merge request !3385
| * | | | CS multilinedropdown-arrow-supportPhil Hughes2016-04-051-5/+5
| | | | |
| * | | | Fixed issue based on feedbackPhil Hughes2016-03-311-21/+26
| | | | |
| * | | | Moved back some css classesPhil Hughes2016-03-312-12/+5
| | | | |
| * | | | Enter triggers the currently highlighted element clickPhil Hughes2016-03-311-12/+13
| | | | |
| * | | | Correctly scrolls the dropdown up & down with arrow keysPhil Hughes2016-03-311-4/+11
| | | | |
| * | | | Scrolls the dropdown content downPhil Hughes2016-03-311-2/+14
| | | | |
| * | | | Started arrow key movement on dropdownsPhil Hughes2016-03-312-6/+62
| | | | |
* | | | | Merge branch 'note-form-design' into 'master' Jacob Schatz2016-04-0523-266/+254
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Notes form design update Part of #3401 See merge request !3442