summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* change logic to identify group milestonesissue_30126_feselfup2017-06-271-1/+1
|
* bring project tabs back in project milestone show viewsselfup2017-06-271-0/+22
|
* fix legacy milestone object evaluation in hamlselfup2017-06-272-8/+10
|
* Merge branch 'issue_30126_be' into issue_30126_feselfup2017-06-2716-176/+131
|\
| * Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵selfup2017-06-2716-176/+131
| |\ | | | | | | | | | issue_30126_be
| | * Backend refactoringFelipe Artur2017-06-2712-144/+110
| | |
| | * Add group_id to milestonesFelipe Artur2017-06-274-39/+18
| | |
| | * Improve title validationFelipe Artur2017-06-273-7/+17
| | |
* | | use correct paths for milestone issues and milestonesselfup2017-06-271-25/+2
| | |
* | | add links to issues and MRs for single milestone view - wrong links for now ↵selfup2017-06-262-1/+13
| | | | | | | | | | | | but UI is being built [ci-skip]
* | | Merge branch 'issue_30126_be' into issue_30126_feselfup2017-06-266-15/+21
|\ \ \ | |/ /
| * | Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵selfup2017-06-266-15/+21
| |\ \ | | |/ | | | | | | issue_30126_be
| | * Validate milestone title uniquenessFelipe Artur2017-06-264-13/+19
| | |
| | * Fix view problem with dashboard milestonesFelipe Artur2017-06-262-2/+2
| | |
* | | Merge branch 'issue_30126_be' into issue_30126_feselfup2017-06-238-27/+72
|\ \ \ | |/ /
| * | Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵selfup2017-06-238-27/+72
| |\ \ | | |/ | | | | | | issue_30126_be
| | * Filter group milestones by stateFelipe Artur2017-06-238-27/+72
| | |
* | | Merge branch 'issue_30126_be' into issue_30126_feselfup2017-06-234-8/+24
|\ \ \ | |/ /
| * | Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵selfup2017-06-234-8/+24
| |\ \ | | |/ | | | | | | issue_30126_be
| | * Tweaks go group milestoneFelipe Artur2017-06-224-8/+24
| | |
* | | indentify if a milestone is group or project basedselfup2017-06-221-0/+4
|/ /
* | remove one line of text at the top saying group name - remove delete buttonRegis2017-06-214-9/+0
| |
* | remove project label field when creating new group milestoneRegis2017-06-211-5/+0
|/
* Fix method typoFelipe Artur2017-06-211-2/+2
|
* Fix wrong method call o milestoneishFelipe Artur2017-06-211-2/+2
|
* Create group milestonesFelipe Artur2017-06-2112-106/+129
|
* Create group milestone modelFelipe Artur2017-06-212-32/+36
|
* Add group milestones tableFelipe Artur2017-06-213-1/+68
|
* Merge branch '25164-disable-fork-on-project-limit' into 'master'Rémy Coutable2017-06-1911-0/+35
|\ | | | | | | | | | | | | Disable fork button on project limit Closes #25164 See merge request !12145
| * Disable fork button on project limitvanadium232017-06-1611-0/+35
| |
* | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-195-41/+128
|\ \ | | | | | | | | | | | | repository: index submodules by path See merge request !10798
| * | repository: index submodules by pathDavid Turner2017-06-165-41/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodules have a name in the configuration, but this name is simply the path at which the submodule was initially checked in (by default -- the name is totally arbitrary). If a submodule is moved, it retains its original name, but its path changes. Since we discover submodules inside trees, we have their path but not necessarily their name. Make the submodules() function return the submodule hash indexed by path rather than name, so that renamed submodules can be looked up. Signed-off-by: David Turner <novalis@novalis.org>
* | | Merge branch 'update-column-in-batches-batch-size' into 'master'Rémy Coutable2017-06-191-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Put an upper limit on update batches See merge request !12265
| * | | Put an upper limit on update batchesupdate-column-in-batches-batch-sizeYorick Peterse2017-06-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using update_column_in_batches the upper limit on the batch size is now 1000. This ensures that for very large tables we don't lock tens of thousands of rows during the update. This in turn should reduce the likelyhood of running into deadlocks.
* | | | Merge branch 'reduce-sidekiq-wait-timings' into 'master'Rémy Coutable2017-06-193-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce wait timings for Sidekiq jobs See merge request !12270
| * | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-193-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the time spent waiting for Sidekiq jobs to complete in JobWaiter, and reduces the sleep interval when trying to acquire the lease for refreshing authorizations. These changes should reduce the time spent just waiting for a lock, which we seem to be spending most time in when running the AuthorizedProjectsWorker.
* | | | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into ↵Douwe Maan2017-06-193-13/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensures default user limits when external user is unchecked Closes #30725 See merge request !12218
| * | | | | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-192-9/+11
| | | | | |
| * | | | | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-163-6/+45
| | | | | |
* | | | | | Merge branch '28139-use-color-input-broadcast-messages' into 'master'Phil Hughes2017-06-192-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use color inputs for broadcast messages Closes #28139 See merge request !12237
| * | | | | | Use color inputs for broadcast messagesAnnabel Dunstone Gray2017-06-192-2/+6
|/ / / / / /
* | | | | | Merge branch 'group-label-permissions-docs' into 'master'Achilleas Pipinellis2017-06-191-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs permissions for group labels See merge request !12269
| * | | | | | Docs permissions for group labelsgroup-label-permissions-docsVictor Wu2017-06-191-0/+1
| | | | | | |
* | | | | | | Merge branch 'winh-label-filter-hover' into 'master'Annabel Dunstone Gray2017-06-192-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Darken label color in search filter when hovering Closes #31899 See merge request !12182
| * | | | | | | Darken label color in search filter when hoveringwinh-label-filter-hoverwinh2017-06-162-1/+2
| | | | | | | |
* | | | | | | | Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct ByAuthor translation in commit box Closes #33819 See merge request !12256
| * | | | | | | correct ByAuthor translation in commit box33819-authorbySimon Knox2017-06-191-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-1912-68/+265
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "project was moved" error messages for git See merge request !11259
| * | | | | | | | Add specific test caseMichael Kozono2017-06-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test and its context exist only to ensure this behavior is fixed: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11259#note_29262426
| * | | | | | | | Add “Project moved” error to Git-over-HTTPMichael Kozono2017-06-163-40/+37
| | | | | | | | |