Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add s selectors for supported avatars.user-avatar-vue-ce | Bryce Johnson | 2017-05-18 | 1 | -0/+2 |
| | |||||
* | Fixes per feedback on user avatar components. | Bryce Johnson | 2017-05-18 | 3 | -23/+14 |
| | |||||
* | Consolidate user avatar Vue logic | Bryce Johnson | 2017-05-18 | 17 | -70/+314 |
| | |||||
* | Fix ProjectCacheWorker for plain READMEs | Toon Claes | 2017-05-18 | 1 | -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 times | Kushal Pandya | 2017-05-18 | 1 | -3/+3 |
| | |||||
* | Merge branch 'dm-gemfile-viewer' | Rémy Coutable | 2017-05-18 | 16 | -3/+268 |
|\ | | | | | | | See merge request !11346. | ||||
| * | Add auxiliary blob viewers to dependency files | Douwe Maan | 2017-05-17 | 16 | -3/+268 |
| | | |||||
* | | Merge branch 'fix-trailing-space-mr-widget' into 'master' | Fatih Acet | 2017-05-18 | 1 | -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-widget | Jose Ivan Vargas | 2017-05-17 | 1 | -4/+1 |
| | | | |||||
* | | | Merge branch 'change-url-in-specific-runners-registration-steps' into 'master' | Kamil Trzciński | 2017-05-18 | 1 | -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-steps | Tomasz Maczukin | 2017-05-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'mk-fix-issue-1843' into 'master' | Douwe Maan | 2017-05-18 | 2 | -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-1843 | Douwe Maan | 2017-05-18 | 2 | -5/+3 |
| | | | | | |||||
| * | | | | Fixes #32474 | Michael Kozono | 2017-05-17 | 1 | -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 Coutable | 2017-05-18 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Deleting an invited member causes 500 error Closes #32504 See merge request !11481 | ||||
| * | | | | Fix: Deleting an invited member causes 500 error | Valery Sizov | 2017-05-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'dm-empty-tree-readme' into 'master' | Robert Speicher | 2017-05-18 | 1 | -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-readme | Douwe Maan | 2017-05-17 | 1 | -7/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'gitaly-local-branches' into 'master' | Douwe Maan | 2017-05-18 | 1 | -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-branches | Alejandro Rodríguez | 2017-05-17 | 1 | -15/+1 |
| | | | | | | |||||
* | | | | | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master' | Phil Hughes | 2017-05-18 | 2 | -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-note | Eric Eastwood | 2017-05-17 | 2 | -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 Gray | 2017-05-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recenter profile page nav links Closes #32465 See merge request !11464 | ||||
| * | | | | | | recenter profile page nav links32465-center | Simon Knox | 2017-05-18 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'backport-ce-upstream-change' into 'master' | Rémy Coutable | 2017-05-18 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate cache invalidation from IssuableBaseService See merge request !11475 | ||||
| * | | | | | | | Remove duplicate cache invalidation from IssuableBaseService | Rémy Coutable | 2017-05-18 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '32359-align-resolve-btn' into 'master' | Filipa Lacerda | 2017-05-18 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align resolve comment btn Closes #32359 See merge request !11457 | ||||
| * | | | | | | | Align resolve comment btn32359-align-resolve-btn | Annabel Dunstone Gray | 2017-05-17 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵ | Phil Hughes | 2017-05-18 | 3 | -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-case | Eric Eastwood | 2017-05-18 | 3 | -22/+24 |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449 | ||||
* | | | | | | | | Disable reference prefixes in notes for Snippets | Sam Rose | 2017-05-18 | 3 | -6/+14 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch ↵ | Phil Hughes | 2017-05-18 | 1 | -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-disabled | Clement Ho | 2017-05-17 | 1 | -2/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Use to toggle the dropdown | Clement Ho | 2017-05-17 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add test.js and test.css to disable animations during testing and include ↵ | Luke "Jared" Bennett | 2017-05-16 | 3 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these in _head when testing | ||||
| * | | | | | | | | Merge branch 'master' into ↵ | Clement Ho | 2017-05-16 | 335 | -2016/+2409 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled' | ||||
| * | | | | | | | | | Fix conflict on users_select | Clement Ho | 2017-05-12 | 1 | -606/+599 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add additional EE check | Clement Ho | 2017-05-11 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Automatically close user dropdown for CE | Clement Ho | 2017-05-09 | 1 | -0/+9 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'patch-20' into 'master' | Achilleas Pipinellis | 2017-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update link to documentation See merge request !11468 | ||||
| * | | | | | | | | | | Update link to documentation | Max Raab | 2017-05-18 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'dm-readme-viewer' into 'master' | Rémy Coutable | 2017-05-18 | 6 | -4/+31 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for README See merge request !11366 | ||||
| * | | | | | | | | | Add auxiliary viewer for READMEdm-readme-viewer | Douwe Maan | 2017-05-17 | 6 | -4/+31 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dm-tree-last-commit' into 'master' | Dmitriy Zaporozhets | 2017-05-17 | 4 | -3/+6 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Show last commit for current tree on tree page See merge request !11442 | ||||
| * | | | | | | | | Show last commit for current tree on tree page | Douwe Maan | 2017-05-17 | 4 | -3/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix Ordered Task List Items | Jared Deckard | 2017-05-17 | 1 | -2/+2 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Add auxiliary blob viewer for CHANGELOG | Douwe Maan | 2017-05-17 | 5 | -2/+25 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'dm-consistent-commit-widget' into 'master' | Dmitriy Zaporozhets | 2017-05-17 | 6 | -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-widget | Douwe Maan | 2017-05-17 | 6 | -59/+11 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'get_rid_of_pluck' into 'master' | Yorick Peterse | 2017-05-17 | 1 | -3/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of pluck in app/services/members/authorized_destroy_service.rb Closes #32372 See merge request !11433 |