| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Refine MR widget styling for buttons and info text | Kushal Pandya | 2017-05-19 | 3 | -2/+18 |
| | | |||||
| * | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 2 | -13/+11 |
| |\ | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532 | ||||
| | * | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 2 | -13/+11 |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
| * | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' ↵ | Annabel Dunstone Gray | 2017-05-19 | 1 | -1/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Side by side MR discussion should stretch to max width" Closes #32556 See merge request !11508 | ||||
| | * | | Remove width limit from discussion notes32556-side-by-side-mr-discussion-should-stretch-to-max-width | Clement Ho | 2017-05-19 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'patch-21' into 'master' | Clement Ho | 2017-05-19 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording in settings / CI/CD Pipelines Closes #32555 See merge request !11516 | ||||
| | * | | | Update edit.html.hamlpatch-21 | Fabio Busatto | 2017-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | Closes #32555 | ||||
| * | | | | Replaced duplicate z-index with index of 400 | Luke "Jared" Bennett | 2017-05-19 | 1 | -2/+1 |
| | |/ / |/| | | |||||
| * | | | Merge branch 'mr-widget-refresh-failed' into 'master' | Filipa Lacerda | 2017-05-19 | 1 | -1/+27 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add refresh button into MR widget failed state. Closes #32543 See merge request !11519 | ||||
| | * | | | MRWidget: Make error message bold and red.mr-widget-refresh-failed | Fatih Acet | 2017-05-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | MRWidget: Change refresh button place in failed state. | Fatih Acet | 2017-05-19 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | MRWidget: Add refresh button into MR widget failed state. | Fatih Acet | 2017-05-19 | 1 | -0/+26 |
| | | | | | |||||
| * | | | | Fixes the 500 for custom apearance header logo and logo | Alexis Reigel | 2017-05-19 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'dm-fix-readme-project-view' into 'master' | Dmitriy Zaporozhets | 2017-05-19 | 4 | -45/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425 | ||||
| | * | | | | Remove readme project_view option | Douwe Maan | 2017-05-19 | 4 | -45/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'dm-render-plain-readme' into 'master' | Rémy Coutable | 2017-05-19 | 2 | -8/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Render plain README using Markup viewer so it is displayed below tree See merge request !11510 | ||||
| | * | | | | | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readme | Douwe Maan | 2017-05-18 | 2 | -8/+10 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'user-avatar-vue-ce' into 'master' | Phil Hughes | 2017-05-19 | 17 | -70/+307 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718 | ||||
| | * | | | | | 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 JavaScript translations that are using a namespacefix-js-translations | Ruben Davila | 2017-05-18 | 6 | -11/+11 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master' | Robert Speicher | 2017-05-18 | 2 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop MR conflict code from blowing up when branches are missing Closes #32544 See merge request !11501 | ||||
| | * | | | | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing | Douwe Maan | 2017-05-18 | 2 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'delete-old-mr-widget' into 'master' | Fatih Acet | 2017-05-18 | 1 | -303/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Delete merge_request_widget.js See merge request !11452 | ||||
| | * | | | | | Delete merge_request_widget.jsdelete-old-mr-widget | Luke "Jared" Bennett | 2017-05-17 | 1 | -303/+0 |
| | | | | | | | |||||
| * | | | | | | Fix clicking disabled clipboard button toolip | Luke "Jared" Bennett | 2017-05-18 | 1 | -2/+2 |
| | |_|/ / / |/| | | | | |||||
| * | | | | | 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 |
| | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |