summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add s selectors for supported avatars.user-avatar-vue-ceBryce Johnson2017-05-181-0/+2
|
* Fixes per feedback on user avatar components.Bryce Johnson2017-05-183-23/+14
|
* Consolidate user avatar Vue logicBryce Johnson2017-05-1817-70/+314
|
* Fix ProjectCacheWorker for plain READMEsToon Claes2017-05-181-0/+3
| | | | | | The ProjectCacheWorker refreshes cache periodically, but it runs outside Rails context. So include the ActionView helpers so the `content_tag` method is available.
* Fix ability to edit diff notes multiple timesKushal Pandya2017-05-181-3/+3
|
* Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-1816-3/+268
|\ | | | | | | See merge request !11346.
| * Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-1716-3/+268
| |
* | Merge branch 'fix-trailing-space-mr-widget' into 'master'Fatih Acet2017-05-181-4/+1
|\ \ | | | | | | | | | | | | | | | | | | Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463
| * | Refactored the anchor tag to remove the trailing space in the target branchfix-trailing-space-mr-widgetJose Ivan Vargas2017-05-171-4/+1
| | |
* | | Merge branch 'change-url-in-specific-runners-registration-steps' into 'master'Kamil Trzciński2017-05-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove references to '/ci' path while describing Runner's registration See merge request !10518
| * | | Remove references to '/ci' path while describing Runner's registrationchange-url-in-specific-runners-registration-stepsTomasz Maczukin2017-05-151-1/+1
| | | |
* | | | Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-182-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix root groups redirecting to group owner Closes #32474 See merge request !11465
| * | | | Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843Douwe Maan2017-05-182-5/+3
| | | | |
| * | | | Fixes #32474Michael Kozono2017-05-171-1/+3
| | |/ / | |/| | | | | | | | | | Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
* | | | Merge branch 'fix_removing_invited_member' into 'master'Rémy Coutable2017-05-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Deleting an invited member causes 500 error Closes #32504 See merge request !11481
| * | | | Fix: Deleting an invited member causes 500 errorValery Sizov2017-05-181-1/+1
| | | | |
* | | | | Merge branch 'dm-empty-tree-readme' into 'master'Robert Speicher2017-05-181-7/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't blow up when a tree readme is empty and consequently has no rich viewer Closes #32396 See merge request !11459
| * | | | | Don't blow up when a tree readme is empty and consequently has no rich viewerdm-empty-tree-readmeDouwe Maan2017-05-171-7/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-181-15/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's local_branches operation into repo code Closes #27379 See merge request !10059
| * | | | | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-171-15/+1
| | | | | |
* | | | | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'Phil Hughes2017-05-182-8/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to unresolved/expanded diff note Closes #32424 See merge request !11458
| * | | | | | Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-noteEric Eastwood2017-05-172-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
* | | | | | | Merge branch '32465-center' into 'master'Annabel Dunstone Gray2017-05-181-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recenter profile page nav links Closes #32465 See merge request !11464
| * | | | | | recenter profile page nav links32465-centerSimon Knox2017-05-181-2/+2
| | | | | | |
* | | | | | | Merge branch 'backport-ce-upstream-change' into 'master'Rémy Coutable2017-05-181-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate cache invalidation from IssuableBaseService See merge request !11475
| * | | | | | | Remove duplicate cache invalidation from IssuableBaseServiceRémy Coutable2017-05-181-1/+0
| | | | | | | |
* | | | | | | | Merge branch '32359-align-resolve-btn' into 'master'Filipa Lacerda2017-05-181-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align resolve comment btn Closes #32359 See merge request !11457
| * | | | | | | Align resolve comment btn32359-align-resolve-btnAnnabel Dunstone Gray2017-05-171-3/+3
| | | | | | | |
* | | | | | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵Phil Hughes2017-05-183-22/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472
| * | | | | | | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-caseEric Eastwood2017-05-183-22/+24
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
* | | | | | | | Disable reference prefixes in notes for SnippetsSam Rose2017-05-183-6/+14
| | | | | | | |
* | | | | | | | Merge branch ↵Phil Hughes2017-05-181-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled' into 'master' Automatically close user dropdown for CE Closes #31987 See merge request !11189
| * | | | | | | | Remove unnecessary hidden()31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabledClement Ho2017-05-171-2/+0
| | | | | | | | |
| * | | | | | | | Use to toggle the dropdownClement Ho2017-05-171-1/+1
| | | | | | | | |
| * | | | | | | | Add test.js and test.css to disable animations during testing and include ↵Luke "Jared" Bennett2017-05-163-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these in _head when testing
| * | | | | | | | Merge branch 'master' into ↵Clement Ho2017-05-16335-2016/+2409
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled'
| * | | | | | | | | Fix conflict on users_selectClement Ho2017-05-121-606/+599
| | | | | | | | | |
| * | | | | | | | | Add additional EE checkClement Ho2017-05-111-1/+3
| | | | | | | | | |
| * | | | | | | | | Automatically close user dropdown for CEClement Ho2017-05-091-0/+9
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-20' into 'master'Achilleas Pipinellis2017-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update link to documentation See merge request !11468
| * | | | | | | | | | Update link to documentationMax Raab2017-05-181-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dm-readme-viewer' into 'master'Rémy Coutable2017-05-186-4/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for README See merge request !11366
| * | | | | | | | | Add auxiliary viewer for READMEdm-readme-viewerDouwe Maan2017-05-176-4/+31
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'dm-tree-last-commit' into 'master'Dmitriy Zaporozhets2017-05-174-3/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Show last commit for current tree on tree page See merge request !11442
| * | | | | | | | Show last commit for current tree on tree pageDouwe Maan2017-05-174-3/+6
| | | | | | | | |
* | | | | | | | | Fix Ordered Task List ItemsJared Deckard2017-05-171-2/+2
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-175-2/+25
|/ / / / / / /
* | | | | | | Merge branch 'dm-consistent-commit-widget' into 'master' Dmitriy Zaporozhets2017-05-176-59/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use same last commit widget on project homepage and tree view Closes #32245 See merge request !11424
| * | | | | | Use same last commit widget on project homepage and tree viewdm-consistent-commit-widgetDouwe Maan2017-05-176-59/+11
| | | | | | |
* | | | | | | Merge branch 'get_rid_of_pluck' into 'master' Yorick Peterse2017-05-171-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of pluck in app/services/members/authorized_destroy_service.rb Closes #32372 See merge request !11433