summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Address feedbackDouwe Maan2017-05-251-4/+2
|
* Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
|
* Remove @commit in compare and MR controllersDouwe Maan2017-05-233-11/+4
|
* Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-2314-80/+49
|
* Clean up diff renderingDouwe Maan2017-05-2313-134/+121
|
* Consistently style image in blob and diffDouwe Maan2017-05-233-3/+2
|
* Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-237-32/+32
|
* Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-231-0/+4
|\ | | | | | | | | | | | | Fix right-sidebar gap on mobile Closes #32735 See merge request !11625
| * Fix sidebar coming up short on mobile32735-fix-right-sidebar-coming-up-shortEric Eastwood2017-05-231-0/+4
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/32735
* | Merge branch ↵Robert Speicher2017-05-231-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '29881-default-project-view-highlighted-tab-when-changing-settings' into 'master' Change ‘Project view’ label to ‘Project home page content’ Closes #29881 See merge request !11650
| * | Change ‘Project view’ label to ‘Project home page content’29881-default-project-view-highlighted-tab-when-changing-settingsPedro Moreira da Silva2017-05-231-2/+2
| | |
* | | Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-233-0/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline etag Closes #32658 See merge request !11615
| * | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etagZ.J. van de Weg2017-05-222-9/+7
| | | | | | | | | | | | | | | | These were untested by the cherry picked commit.
| * | | Add MISSING e-tag refresh of resource for Job, and Pipeline GraphKamil Trzcinski2017-05-223-0/+47
| | | |
* | | | Merge branch 'winh-filters-dropdown-scroll' into 'master'Annabel Dunstone Gray2017-05-231-5/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Make static filter entries scroll with dynamic ones See merge request !11640
| * | | Make static filter entries scroll with dynamic oneswinh-filters-dropdown-scrollwinh2017-05-231-5/+2
| | | |
* | | | Merge branch '32738-fix-project-title-ellipsis-doing-nothing' into 'master'Annabel Dunstone Gray2017-05-231-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group/project name ellipsis button doing nothing Closes #32738 See merge request !11623
| * | | | Fix group/project name ellipsis button doing nothing32738-fix-project-title-ellipsis-doing-nothingEric Eastwood2017-05-221-3/+3
| | |_|/ | |/| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32738
* | | | Merge branch '17489-hide-code-from-guests' into 'master'Douwe Maan2017-05-233-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide clone panel and file list when user is only a guest (with review comments addressed) Closes #30432, #3142, and #17489 See merge request !11631
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov2017-05-23642-5360/+10361
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 17489-hide-code-from-guests
| * | | | | Hide clone panel and file list when user is only a guestJames Clark2017-05-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#17489 Fix test finding two of the same element Capybara will raise an exception because it finds two elements that match .nav-links. This means this test would fail, even if the page meets the conditions for passing the test. Add more tests for guest access
* | | | | | Merge branch 'winh-frontend-user-cache' into 'master'Filipa Lacerda2017-05-233-14/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404
| * | | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cachewinh2017-05-231-0/+28
| | | | | | |
| * | | | | | Extract Cache class from AjaxCachewinh2017-05-212-14/+23
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' ↵Fatih Acet2017-05-231-3/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Follow-up from "Add "SHA mismatch" state to the MR widget"" Closes #32480 See merge request !11466
| * | | | | ensure MergeRequestStore sha value never changes after instantiation32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widgetMike Greiling2017-05-171-3/+2
| | | | | |
* | | | | | Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński2017-05-231-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort environments folders when opening them Closes #30814 See merge request !11436
| * | | | | | Sort environments folders when opening themZ.J. van de Weg2017-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#30814
* | | | | | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-234-9/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214
| * | | | | | | Refactored transfer_service #execute actionprevent-project-transferJose Ivan Vargas2017-05-221-10/+6
| | | | | | | |
| * | | | | | | minor adjustments to the specsJose Ivan Vargas2017-05-221-1/+1
| | | | | | | |
| * | | | | | | Renamed some messages and refactored the project_edit class to a functionJose Ivan Vargas2017-05-224-19/+12
| | | | | | | |
| * | | | | | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-224-5/+32
| | | | | | | |
* | | | | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master'Fatih Acet2017-05-222-6/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505
| * | | | | | | | Change links to issuable meta to blackAnnabel Dunstone Gray2017-05-192-6/+2
| | | | | | | | |
* | | | | | | | | Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-221-4/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32486 Fix placement of note emoji on hover Closes #32486 See merge request !11605
| * | | | | | | | 32486 Fix placement of note emoji on hover32486-fix-note-emoji-placementtauriedavis2017-05-221-4/+0
| | | | | | | | |
* | | | | | | | | Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR widget styling fixes Closes #32657 See merge request !11591
| * | | | | | | | | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-222-7/+15
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-223-4/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing of issue emojis Closes #32631 See merge request !11567
| * | | | | | | | | Fix spacing of issue emojis32631-issue-emoji-wrapAnnabel Dunstone Gray2017-05-193-4/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master'Annabel Dunstone Gray2017-05-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32623 Change order of commits ahead and behind on divergence graph for branch list Closes #32623 See merge request !11559
| * | | | | | | | | | 32623 Change order of commits ahead and behind on divergence graph for ↵ce#32623-browser-tooltip-commits-branch-listtauriedavis2017-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch list
* | | | | | | | | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵Phil Hughes2017-05-221-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix jQuery data attribute caching issue causing expanding issues Closes #32705 See merge request !11609
| * | | | | | | | | | Fix jQuery data attribute caching issue casuing expanding issuesEric Eastwood2017-05-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command | Result $link.data('lineType') | '' $link.data('line-type') | '' $link.attr('data-line-type') | 'new' $link[0].dataset.lineType | 'new'
* | | | | | | | | | | Merge branch '32570-project-activity-tab-border' into 'master'Annabel Dunstone Gray2017-05-223-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32570 Fix border-bottom for project activity tab Closes #32570 See merge request !11568
| * | | | | | | | | | 32570 Fix border-bottom for project activity tab32570-project-activity-tab-bordertauriedavis2017-05-193-4/+4
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'update-coding-translation' into 'master'Douwe Maan2017-05-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change translation for 'coding' by 'desarrollo' for spanish See merge request !11580
| * | | | | | | | | | Change translation for 'coding' by 'desarrollo' for Spanishupdate-coding-translationRuben Davila2017-05-201-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'adopt-es-module-syntax' into 'master'Filipa Lacerda2017-05-2246-165/+143
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adopt ES module syntax See merge request !9567