Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Address feedback | Douwe Maan | 2017-05-25 | 1 | -4/+2 |
| | |||||
* | Change code comment formattingdm-diff-cleanup | Douwe Maan | 2017-05-23 | 1 | -1/+3 |
| | |||||
* | Remove @commit in compare and MR controllers | Douwe Maan | 2017-05-23 | 3 | -11/+4 |
| | |||||
* | Pass fallback_diff_refs to Diff::File instead of using view helpers | Douwe Maan | 2017-05-23 | 14 | -80/+49 |
| | |||||
* | Clean up diff rendering | Douwe Maan | 2017-05-23 | 13 | -134/+121 |
| | |||||
* | Consistently style image in blob and diff | Douwe Maan | 2017-05-23 | 3 | -3/+2 |
| | |||||
* | Add question mark to Gitlab::Diff::File predicate methods | Douwe Maan | 2017-05-23 | 7 | -32/+32 |
| | |||||
* | Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master' | Annabel Dunstone Gray | 2017-05-23 | 1 | -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-short | Eric Eastwood | 2017-05-23 | 1 | -0/+4 |
| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/32735 | ||||
* | | Merge branch ↵ | Robert Speicher | 2017-05-23 | 1 | -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-settings | Pedro Moreira da Silva | 2017-05-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'zj-fix-pipeline-etag' into 'master' | Kamil Trzciński | 2017-05-23 | 3 | -0/+45 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline etag Closes #32658 See merge request !11615 | ||||
| * | | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etag | Z.J. van de Weg | 2017-05-22 | 2 | -9/+7 |
| | | | | | | | | | | | | | | | | These were untested by the cherry picked commit. | ||||
| * | | | Add MISSING e-tag refresh of resource for Job, and Pipeline Graph | Kamil Trzcinski | 2017-05-22 | 3 | -0/+47 |
| | | | | |||||
* | | | | Merge branch 'winh-filters-dropdown-scroll' into 'master' | Annabel Dunstone Gray | 2017-05-23 | 1 | -5/+2 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Make static filter entries scroll with dynamic ones See merge request !11640 | ||||
| * | | | Make static filter entries scroll with dynamic oneswinh-filters-dropdown-scroll | winh | 2017-05-23 | 1 | -5/+2 |
| | | | | |||||
* | | | | Merge branch '32738-fix-project-title-ellipsis-doing-nothing' into 'master' | Annabel Dunstone Gray | 2017-05-23 | 1 | -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-nothing | Eric Eastwood | 2017-05-22 | 1 | -3/+3 |
| | |_|/ | |/| | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32738 | ||||
* | | | | Merge branch '17489-hide-code-from-guests' into 'master' | Douwe Maan | 2017-05-23 | 3 | -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 Sizov | 2017-05-23 | 642 | -5360/+10361 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | 17489-hide-code-from-guests | ||||
| * | | | | | Hide clone panel and file list when user is only a guest | James Clark | 2017-05-07 | 3 | -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 Lacerda | 2017-05-23 | 3 | -14/+51 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404 | ||||
| * | | | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cache | winh | 2017-05-23 | 1 | -0/+28 |
| | | | | | | | |||||
| * | | | | | | Extract Cache class from AjaxCache | winh | 2017-05-21 | 2 | -14/+23 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' ↵ | Fatih Acet | 2017-05-23 | 1 | -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-widget | Mike Greiling | 2017-05-17 | 1 | -3/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'zj-sort-env-folders' into 'master' | Kamil Trzciński | 2017-05-23 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort environments folders when opening them Closes #30814 See merge request !11436 | ||||
| * | | | | | | Sort environments folders when opening them | Z.J. van de Weg | 2017-05-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#30814 | ||||
* | | | | | | | Merge branch 'prevent-project-transfer' into 'master' | Douwe Maan | 2017-05-23 | 4 | -9/+25 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214 | ||||
| * | | | | | | | Refactored transfer_service #execute actionprevent-project-transfer | Jose Ivan Vargas | 2017-05-22 | 1 | -10/+6 |
| | | | | | | | | |||||
| * | | | | | | | minor adjustments to the specs | Jose Ivan Vargas | 2017-05-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Renamed some messages and refactored the project_edit class to a function | Jose Ivan Vargas | 2017-05-22 | 4 | -19/+12 |
| | | | | | | | | |||||
| * | | | | | | | Prevent project transfer if a new group is not selected | Jose Ivan Vargas | 2017-05-22 | 4 | -5/+32 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master' | Fatih Acet | 2017-05-22 | 2 | -6/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505 | ||||
| * | | | | | | | | Change links to issuable meta to black | Annabel Dunstone Gray | 2017-05-19 | 2 | -6/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '32486-fix-note-emoji-placement' into 'master' | Annabel Dunstone Gray | 2017-05-22 | 1 | -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-placement | tauriedavis | 2017-05-22 | 1 | -4/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '32657-fix-mr-widget-styles' into 'master' | Fatih Acet | 2017-05-22 | 2 | -7/+15 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR widget styling fixes Closes #32657 See merge request !11591 | ||||
| * | | | | | | | | | MR widget styling fixes32657-fix-mr-widget-styles | kushalpandya | 2017-05-22 | 2 | -7/+15 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '32631-issue-emoji-wrap' into 'master' | Clement Ho | 2017-05-22 | 3 | -4/+8 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing of issue emojis Closes #32631 See merge request !11567 | ||||
| * | | | | | | | | | Fix spacing of issue emojis32631-issue-emoji-wrap | Annabel Dunstone Gray | 2017-05-19 | 3 | -4/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master' | Annabel Dunstone Gray | 2017-05-22 | 1 | -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-list | tauriedavis | 2017-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch list | ||||
* | | | | | | | | | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵ | Phil Hughes | 2017-05-22 | 1 | -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 issues | Eric Eastwood | 2017-05-22 | 1 | -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 Gray | 2017-05-22 | 3 | -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-border | tauriedavis | 2017-05-19 | 3 | -4/+4 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'update-coding-translation' into 'master' | Douwe Maan | 2017-05-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change translation for 'coding' by 'desarrollo' for spanish See merge request !11580 | ||||
| * | | | | | | | | | | Change translation for 'coding' by 'desarrollo' for Spanishupdate-coding-translation | Ruben Davila | 2017-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'adopt-es-module-syntax' into 'master' | Filipa Lacerda | 2017-05-22 | 46 | -165/+143 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adopt ES module syntax See merge request !9567 |