summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'Douwe Maan2017-12-0728-95/+236
|\ | | | | | | | | | | | | Allow commenting on individual commits inside an MR Closes #31847 See merge request gitlab-org/gitlab-ce!12148
| * adding view and feature specsmicael.bergeron2017-12-074-24/+27
| |
| * cache the Note#commit methodmicael.bergeron2017-12-071-8/+6
| |
| * revert the `#all_pipelines` method to use the pluckmicael.bergeron2017-12-071-2/+1
| | | | | | | | | | the `ci_pipelines.sha` column is not the same type than the `merge_request_diff_commits.sha` column (varchar, bytea)
| * add support for the commit reference filtermicael.bergeron2017-12-077-38/+26
| |
| * tidying up the changesmicael.bergeron2017-12-073-18/+13
| |
| * add support for commit (in mr) to reference filtermicael.bergeron2017-12-074-2/+24
| |
| * corrects the url buildingmicael.bergeron2017-12-079-41/+34
| |
| * diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-077-16/+39
| | | | | | | | add a spec for commit merge request diff notes
| * Allow commenting on individual commits inside an MRDouwe Maan2017-12-0723-66/+186
| |
* | Remove Rugged::Repository#empty?Zeger-Jan van de Weg2017-12-072-10/+12
| |
* | Use Markdown styling for new project guidelinesMarkus Koller2017-12-071-1/+2
|/
* Merge branch 'bvl-dont-reset-timeago-title' into 'master'Filipa Lacerda2017-12-071-2/+0
|\ | | | | | | | | Don't set timeago title to what was already there. See merge request gitlab-org/gitlab-ce!15780
| * Don't set timeago title to what was already there.bvl-dont-reset-timeago-titleBob Van Landuyt2017-12-071-2/+0
| | | | | | | | This didn't actually do anything.
* | Merge branch 'jej/per-user-protected-branches-api-ce' into 'master'Sean McGivern2017-12-072-0/+57
|\ \ | | | | | | | | | | | | CE backport of "ProtectedBranches API handles per user/group granularity" See merge request gitlab-org/gitlab-ce!15747
| * | CE backport of ProtectedBranches API changesJames Edwards-Jones2017-12-072-0/+57
| | | | | | | | | | | | | | | In EE we now allow individual users/groups to be set on POST, which required some refactoring. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3516
* | | Merge branch 'ce-backport-3615' into 'master'Sean McGivern2017-12-072-3/+9
|\ \ \ | | | | | | | | | | | | | | | | Refactor banzai to support referencing from group context See merge request gitlab-org/gitlab-ce!15766
| * | | Refactor banzai to support referencing from group contextce-backport-3615Jarka Kadlecova2017-12-062-3/+9
| | | |
* | | | Support uploads for groupsJarka Kadlecova2017-12-078-28/+98
| | | |
* | | | Merge branch 'outdated-browser-position-fix' into 'master'Filipa Lacerda2017-12-074-21/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed outdated browser banner positioning Closes #40824 See merge request gitlab-org/gitlab-ce!15762
| * | | | Fixed outdated browser banner positioningoutdated-browser-position-fixPhil Hughes2017-12-064-21/+8
| | | | | | | | | | | | | | | | | | | | Closes #40824
* | | | | Merge branch '40573-rename-gke-as-kubernetes-engine' into 'master'Kamil Trzciński2017-12-077-15/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Rename GKE as Kubernetes Engine Closes #40537 See merge request gitlab-org/gitlab-ce!15608
| * | | | Rename GKE as Kubernetes EngineTakuya Noguchi2017-12-067-15/+15
| | | | |
* | | | | Resolve "Display member role per project"Mike Greiling2017-12-0721-94/+188
| | | | |
* | | | | The API isn't using the appropriate services for managing forksFrancisco Javier López2017-12-071-7/+29
| | | | |
* | | | | Merge branch ↵Clement Ho2017-12-071-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40631-sidebar-icon-alignment-for-confidentiality-and-lock-issue-is-misaligned' into 'master' Resolve "Sidebar icon alignment for confidentiality and lock issue is misaligned" Closes #40631 See merge request gitlab-org/gitlab-ce!15692
| * | | | | Correct sidebar-item-icon margin and vertical align40631-sidebar-icon-alignment-for-confidentiality-and-lock-issue-is-misalignedLuke Bennett2017-12-021-8/+8
| | | | | |
* | | | | | Merge branch '40592-dropdown-options-are-misaligned' into 'master'Clement Ho2017-12-071-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Dropdown options are misaligned" Closes #40592 See merge request gitlab-org/gitlab-ce!15693
| * | | | | | remove top from dropdown-label-box that is child of filter-dropdown-item40592-dropdown-options-are-misalignedLuke Bennett2017-12-021-0/+1
| |/ / / / /
* | | | | | Merge branch '32329-empty-state-for-changes-tab-in-mr' into 'master'Clement Ho2017-12-072-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Empty state for Changes tab in MR" Closes #32329 See merge request gitlab-org/gitlab-ce!15611
| * | | | | | Update empty state page of merge request 'changes' tab32329-empty-state-for-changes-tab-in-mrVitaliy @blackst0ne Klachkov2017-11-302-1/+15
| | | | | | |
* | | | | | | Add chevron to create dropdown on repository pageWinnie Hellmann2017-12-067-17/+34
| | | | | | |
* | | | | | | Merge branch ↵Tim Zallmann2017-12-064-26/+88
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22680-unlabel-slash-command-limit-autocomplete-to-applied-labels' into 'master' Resolve "/unlabel quick action - limit autocomplete to applied labels" Closes #22680 and #27319 See merge request gitlab-org/gitlab-ce!11110
| * | | | | | Limit autocomplete menu to applied labelsVitaliy @blackst0ne Klachkov2017-11-284-26/+88
| | | | | | |
* | | | | | | Merge branch '35773-search-box-close-dropdown' into 'master'Annabel Dunstone Gray2017-12-062-67/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close all open dropdowns when search input is clicked Closes #35773 See merge request gitlab-org/gitlab-ce!15737
| * | | | | | | Fix broken testsFilipa Lacerda2017-12-061-1/+1
| | | | | | | |
| * | | | | | | Updates the dropdown to match the docs and remove old hack of stop event ↵35773-search-box-close-dropdownFilipa Lacerda2017-12-062-69/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | propagation
| * | | | | | | Revert to adding open class to dropdownsAnnabel Dunstone Gray2017-12-051-3/+2
| | | | | | | |
| * | | | | | | Close all open dropdowns when search input is clickedAnnabel Dunstone Gray2017-12-051-0/+3
| | | | | | | |
* | | | | | | | Merge branch 'commit-title-wrapping' into 'master'Annabel Dunstone Gray2017-12-061-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes long commit links breaking the commit list layout Closes #36524 See merge request gitlab-org/gitlab-ce!15763
| * | | | | | | | Fixes long commit links breaking the commit list layoutcommit-title-wrappingPhil Hughes2017-12-061-0/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #36524
* | | | | | | | Merge branch 'admin-welcome-new-group-link' into 'master'Filipa Lacerda2017-12-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes admin welcome states new group path Closes #40645 See merge request gitlab-org/gitlab-ce!15761
| * | | | | | | | Fixes admin welcome states new group pathadmin-welcome-new-group-linkPhil Hughes2017-12-061-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #40645
* | | | | | | | Merge branch 'throttle-touching-of-objects' into 'master'Sean McGivern2017-12-064-1/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throttle the number of UPDATEs triggered by touch Closes #34763 See merge request gitlab-org/gitlab-ce!15682
| * | | | | | | | Throttle the number of UPDATEs triggered by touchYorick Peterse2017-12-064-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This throttles the number of UPDATE queries that can be triggered by calling "touch" on a Note, Issue, or MergeRequest. For Note objects we also take care of updating the associated "noteable" relation in a smarter way than Rails does by default.
* | | | | | | | | Merge branch 'patch-24' into 'master'Sean McGivern2017-12-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix graph notes number duplication. See merge request gitlab-org/gitlab-ce!15696
| * | | | | | | | Fix graph notes number duplication.Vladislav Kaverin2017-12-031-1/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Function `pluralize` already returns the number along with pluralized word.
* | | | | | | | Merge branch ↵Sean McGivern2017-12-062-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings' into 'master' Resolve "In Issue board url doesn't take in account hostname settings" Closes #39364 See merge request gitlab-org/gitlab-ce!15703
| * | | | | | | Use path helper instead of url helperLuke Bennett2017-12-032-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'ee-backport-issue_40654' into 'master'Sean McGivern2017-12-062-4/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE-Backport] Fix board filter when milestone is predefined See merge request gitlab-org/gitlab-ce!15750