Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change logic to identify group milestonesissue_30126_fe | selfup | 2017-06-27 | 1 | -1/+1 |
| | |||||
* | bring project tabs back in project milestone show views | selfup | 2017-06-27 | 1 | -0/+22 |
| | |||||
* | fix legacy milestone object evaluation in haml | selfup | 2017-06-27 | 2 | -8/+10 |
| | |||||
* | Merge branch 'issue_30126_be' into issue_30126_fe | selfup | 2017-06-27 | 16 | -176/+131 |
|\ | |||||
| * | Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵ | selfup | 2017-06-27 | 16 | -176/+131 |
| |\ | | | | | | | | | | issue_30126_be | ||||
| | * | Backend refactoring | Felipe Artur | 2017-06-27 | 12 | -144/+110 |
| | | | |||||
| | * | Add group_id to milestones | Felipe Artur | 2017-06-27 | 4 | -39/+18 |
| | | | |||||
| | * | Improve title validation | Felipe Artur | 2017-06-27 | 3 | -7/+17 |
| | | | |||||
* | | | use correct paths for milestone issues and milestones | selfup | 2017-06-27 | 1 | -25/+2 |
| | | | |||||
* | | | add links to issues and MRs for single milestone view - wrong links for now ↵ | selfup | 2017-06-26 | 2 | -1/+13 |
| | | | | | | | | | | | | but UI is being built [ci-skip] | ||||
* | | | Merge branch 'issue_30126_be' into issue_30126_fe | selfup | 2017-06-26 | 6 | -15/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵ | selfup | 2017-06-26 | 6 | -15/+21 |
| |\ \ | | |/ | | | | | | | issue_30126_be | ||||
| | * | Validate milestone title uniqueness | Felipe Artur | 2017-06-26 | 4 | -13/+19 |
| | | | |||||
| | * | Fix view problem with dashboard milestones | Felipe Artur | 2017-06-26 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch 'issue_30126_be' into issue_30126_fe | selfup | 2017-06-23 | 8 | -27/+72 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵ | selfup | 2017-06-23 | 8 | -27/+72 |
| |\ \ | | |/ | | | | | | | issue_30126_be | ||||
| | * | Filter group milestones by state | Felipe Artur | 2017-06-23 | 8 | -27/+72 |
| | | | |||||
* | | | Merge branch 'issue_30126_be' into issue_30126_fe | selfup | 2017-06-23 | 4 | -8/+24 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'issue_30126_be' of gitlab.com:gitlab-org/gitlab-ce into ↵ | selfup | 2017-06-23 | 4 | -8/+24 |
| |\ \ | | |/ | | | | | | | issue_30126_be | ||||
| | * | Tweaks go group milestone | Felipe Artur | 2017-06-22 | 4 | -8/+24 |
| | | | |||||
* | | | indentify if a milestone is group or project based | selfup | 2017-06-22 | 1 | -0/+4 |
|/ / | |||||
* | | remove one line of text at the top saying group name - remove delete button | Regis | 2017-06-21 | 4 | -9/+0 |
| | | |||||
* | | remove project label field when creating new group milestone | Regis | 2017-06-21 | 1 | -5/+0 |
|/ | |||||
* | Fix method typo | Felipe Artur | 2017-06-21 | 1 | -2/+2 |
| | |||||
* | Fix wrong method call o milestoneish | Felipe Artur | 2017-06-21 | 1 | -2/+2 |
| | |||||
* | Create group milestones | Felipe Artur | 2017-06-21 | 12 | -106/+129 |
| | |||||
* | Create group milestone model | Felipe Artur | 2017-06-21 | 2 | -32/+36 |
| | |||||
* | Add group milestones table | Felipe Artur | 2017-06-21 | 3 | -1/+68 |
| | |||||
* | Merge branch '25164-disable-fork-on-project-limit' into 'master' | Rémy Coutable | 2017-06-19 | 11 | -0/+35 |
|\ | | | | | | | | | | | | | Disable fork button on project limit Closes #25164 See merge request !12145 | ||||
| * | Disable fork button on project limit | vanadium23 | 2017-06-16 | 11 | -0/+35 |
| | | |||||
* | | Merge branch 'moved-submodules' into 'master' | Rémy Coutable | 2017-06-19 | 5 | -41/+128 |
|\ \ | | | | | | | | | | | | | repository: index submodules by path See merge request !10798 | ||||
| * | | repository: index submodules by path | David Turner | 2017-06-16 | 5 | -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 Coutable | 2017-06-19 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | Put an upper limit on update batches See merge request !12265 | ||||
| * | | | Put an upper limit on update batchesupdate-column-in-batches-batch-size | Yorick Peterse | 2017-06-19 | 1 | -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 Coutable | 2017-06-19 | 3 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Reduce wait timings for Sidekiq jobs See merge request !12270 | ||||
| * | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timings | Yorick Peterse | 2017-06-19 | 3 | -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 Maan | 2017-06-19 | 3 | -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-user | Tiago Botelho | 2017-06-19 | 2 | -9/+11 |
| | | | | | | |||||
| * | | | | | Ensures default user limits when external user is unchecked | Tiago Botelho | 2017-06-16 | 3 | -6/+45 |
| | | | | | | |||||
* | | | | | | Merge branch '28139-use-color-input-broadcast-messages' into 'master' | Phil Hughes | 2017-06-19 | 2 | -2/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use color inputs for broadcast messages Closes #28139 See merge request !12237 | ||||
| * | | | | | | Use color inputs for broadcast messages | Annabel Dunstone Gray | 2017-06-19 | 2 | -2/+6 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'group-label-permissions-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs permissions for group labels See merge request !12269 | ||||
| * | | | | | | Docs permissions for group labelsgroup-label-permissions-docs | Victor Wu | 2017-06-19 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'winh-label-filter-hover' into 'master' | Annabel Dunstone Gray | 2017-06-19 | 2 | -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-hover | winh | 2017-06-16 | 2 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '33819-authorby' into 'master' | Douwe Maan | 2017-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct ByAuthor translation in commit box Closes #33819 See merge request !12256 | ||||
| * | | | | | | | correct ByAuthor translation in commit box33819-authorby | Simon Knox | 2017-06-19 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master' | Douwe Maan | 2017-06-19 | 12 | -68/+265 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "project was moved" error messages for git See merge request !11259 | ||||
| * | | | | | | | | Add specific test case | Michael Kozono | 2017-06-16 | 1 | -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-HTTP | Michael Kozono | 2017-06-16 | 3 | -40/+37 |
| | | | | | | | | |