summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-219-99/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "create label" functionality on label dropdown **Issue sidebar** ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) **Issues page** ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-2058-191/+3448
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-202-15/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-20267-1053/+4251
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| | * | | | | | | | | | | | | | | Move shared html to a partialAlfredo Sumaran2016-04-183-34/+21
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add is-link attribute to know if a menu item should not be stoppedAlfredo Sumaran2016-04-182-2/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Remove $parentAlfredo Sumaran2016-04-181-6/+5
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add tests to check if a new label is addedAlfredo Sumaran2016-04-151-0/+79
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix create label functionalityAlfredo Sumaran2016-04-151-41/+25
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix Label dropdown and organize codeAlfredo Sumaran2016-04-155-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/labels_select.js.coffee
| | * | | | | | | | | | | | | | | Render proper partialAlfredo Sumaran2016-04-152-2/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add spacesAlfredo Sumaran2016-04-151-3/+3
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Reuse partial for Create Label pageAlfredo Sumaran2016-04-153-18/+21
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Restore broken codeAlfredo Sumaran2016-04-151-9/+6
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-04-212-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'issue_15434' into 'master' Jacob Schatz2016-04-212-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes XSS injection REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434 **Without the fix** ![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif) **With the fix** ![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif) See merge request !1952
| | * | | | | | | | | | | | | | | | Remove unnecessary provided paramAlfredo Sumaran2016-04-211-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Remove unused paramAlfredo Sumaran2016-04-211-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs-issue-15408' into 'master' Robert Speicher2016-04-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined local variable error in Invalid MR template Closes #15408 See merge request !3857
| * | | | | | | | | | | | | | | | | | Fix undefined local variable error in Invalid MR templaters-issue-15408Robert Speicher2016-04-211-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15408
* | | | | | | | | | | | | | | | | | Merge branch 'diff-link-fix' into 'master' Jacob Schatz2016-04-212-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff highlight fixes This fixes a couple of issues with linking/highlight diff lines: - Fixed issue with lines not being selectable when expanding diff - Fixed issue with incorrect line being highlighted if line is in discussion view See merge request !3725
| * | | | | | | | | | | | | | | | | Put back removed line numberdiff-link-fixPhil Hughes2016-04-201-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed issue when scrolling to element and there is an expanderPhil Hughes2016-04-201-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed issue with lines not being selectable when expanding diffPhil Hughes2016-04-201-5/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed issue with incorrect line being highlighted if line is in discussion viewPhil Hughes2016-04-201-4/+4
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '15445-file-renames' into 'master' Jacob Schatz2016-04-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File name change appears on one line Closes #15445 <img src="/uploads/51714555be63af16b810cf528de49192/Screen_Shot_2016-04-21_at_9.22.43_AM.png" width="500px"> See merge request !3854
| * | | | | | | | | | | | | | | | | File name change appears on one lineAnnabel Dunstone2016-04-211-0/+2
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'note-username-text-color' into 'master' Jacob Schatz2016-04-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with author link color on dark diffs Correctly added a color to the author link ![Screen_Shot_2016-04-21_at_08.55.05](/uploads/ffa9e12e868c7b71fa4dd9244114274a/Screen_Shot_2016-04-21_at_08.55.05.png) Fixes #15444 See merge request !3847
| * | | | | | | | | | | | | | | | | Fixed issue with author link color on dark diffsnote-username-text-colorPhil Hughes2016-04-211-0/+3
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sidekiq-memory-sigterm' into 'master' Stan Hu2016-04-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SIGTERM during Sidekiq memory shutdown This makes the memory killer behave more like 'sidekiqctl stop'. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15359 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14462 See merge request !3853
| * | | | | | | | | | | | | | | | Use SIGTERM during Sidekiq memory shutdownJacob Vosmaer2016-04-211-2/+2
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the memory killer behave more like 'sidekiqctl stop'.
* | | | | | | | | | | | | | | | Merge branch 'fix/label-filters' into 'master' Douwe Maan2016-04-214-31/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter labels by including ALL filter titles Fixed query to use `AND` and not `OR`. Refactored relevant specs See merge request !3815
| * | | | | | | | | | | | | | | refactored specs based on feedbackfix/label-filtersJames Lopez2016-04-212-31/+18
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | use wait_for_ajax instead of sleeping for 2 days!James Lopez2016-04-211-10/+12
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | refactored specs, adding more scenariosJames Lopez2016-04-212-22/+34
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filtersJames Lopez2016-04-21218-725/+5866
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/issues/filter_by_labels_spec.rb
| * | | | | | | | | | | | | | | final line missingJames Lopez2016-04-201-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix rubocop warningJames Lopez2016-04-201-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | udpated a few things based on MR feedback. Also added model specJames Lopez2016-04-205-176/+203
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix other spec failuresJames Lopez2016-04-191-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | filter labels by including all filter titles as part of the queryJames Lopez2016-04-193-2/+172
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'revert-sentry-js' into 'master' Jacob Schatz2016-04-215-2482/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sentry-js' into 'master'" This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab. See merge request !3851
| * | | | | | | | | | | | | | | | Revert changelog tooJacob Schatz2016-04-211-1/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Revert "Merge branch 'sentry-js' into 'master' "Jacob Schatz2016-04-214-2481/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab.
* | | | | | | | | | | | | | | | | Merge branch 'top-navigation-concept' into 'master' Dmitriy Zaporozhets2016-04-2116-24/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement top navigation for profile area Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block. I used profile area as a simplest way to implement and test this concept. Your feedback is welcome in comments For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3824
| * | | | | | | | | | | | | | | | Layout navigation should respect layout width settingstop-navigation-conceptDmitriy Zaporozhets2016-04-202-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | | | Fix tests and remove countersDmitriy Zaporozhets2016-04-192-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | | | Implement top navigation concept for profile areaDmitriy Zaporozhets2016-04-1916-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | Merge branch 'document-feature-freeze' into 'master' Douwe Maan2016-04-211-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the feature freeze starting on the 18th cc @dzaporozhets @rspeicher @DouweM @rymai @axil See merge request !3698
| * | | | | | | | | | | | | | | | | Document the feature freeze of stable branchesdocument-feature-freezeYorick Peterse2016-04-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15183