summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflictsYorick Peterse2018-11-011-0/+1
| | | | | | | | | | | This Gem can be used to automatically resolve merge conflicts in db/schema.rb. To use it you still need to initialise the configuration, which can be done by running: merge_db_schema-init --force See https://gitlab.com/gitlab-org/release/framework/issues/42 for more information.
* Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into ↵Nick Thomas2018-10-293-4/+34
|\ | | | | | | | | | | | | 'master' Extract ee specific lines for issues and mr controllers See merge request gitlab-org/gitlab-ce!22569
| * Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-262-1/+18
| | | | | | | | | | Move access checks to their own method so they can be overridden, and port an EE-only method to exist in CE too, with an EE-specific override.
| * Extract EE-specific lines from issues controllerSean McGivern2018-10-241-3/+16
| |
* | Merge branch '53155-structured-logs-params-array' into 'master'Sean McGivern2018-10-293-2/+15
|\ \ | | | | | | | | | | | | | | | | | | Fix open-ended params for api_json.log Closes #53155 See merge request gitlab-org/gitlab-ce!22623
| * | Fix open-ended params for api_json.logAndrew Newdigate2018-10-293-2/+15
|/ /
* | Merge branch 'lyle-master-patch-08152' into 'master'Achilleas Pipinellis2018-10-291-1/+18
|\ \ | | | | | | | | | | | | adds warning against Postgres across NFS See merge request gitlab-org/gitlab-ce!22278
| * | adds warning against Postgres across NFSLyle Kozloff2018-10-291-1/+18
|/ /
* | Merge branch 'ce-7103-show-milestone-dates-within-tooltips' into 'master'Phil Hughes2018-10-294-36/+52
|\ \ | | | | | | | | | | | | CE Backport: Show actual Milestone dates within tooltips for Milestones in Epics sidebar See merge request gitlab-org/gitlab-ce!22653
| * | Update tooltip for when no date is present, port back EE changesce-7103-show-milestone-dates-within-tooltipsKushal Pandya2018-10-294-36/+52
| | |
* | | Merge branch 'ac-post-merge-pipeline' into 'master'Nick Thomas2018-10-2922-118/+588
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | post merge pipeline and environments status Closes #47799 See merge request gitlab-org/gitlab-ce!22292
| * | | post merge pipeline and environments statusAlessio Caiazza2018-10-2922-118/+588
|/ / /
* | | Merge branch 'bw-update-issue-board-doc' into 'master'Marcia Ramos2018-10-291-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify last board navigation documentation Closes gitlab-ee#7760 See merge request gitlab-org/gitlab-ce!22618
| * | | Update issue board documentation based on feedbackbw-update-issue-board-docBrett Walker2018-10-261-2/+2
| | | |
* | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-10-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | `Create a new tag` json Missing double quotes See merge request gitlab-org/gitlab-ce!22614
| * | | | `Create a new tag` json Missing a commapiumn.l2018-10-261-1/+1
| | | | |
* | | | | Merge branch '34758-create-group-clusters' into 'master'Andreas Brandl2018-10-2913-3/+188
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Models and migrations for group level clusters See merge request gitlab-org/gitlab-ce!22307
| * | | | | Associate clusters model to groups34758-create-group-clustersThong Kuah2018-10-2913-3/+188
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though we currently only should have one group for a cluster, we allow the flexibility to associate to other groups in the future. This also matches the runner <=> groups association. - Adds Cluster#first_group, aliased to Cluster#group. For the conceivable future, a cluster will have at most one group. - Prevent mixing of group and project clusters. If project type clusters, it should only have projects assigned. Similarly with groups. - Default cluster_type to :project_type. As it's very small table we can set default and null: false in one release.
* | | | | Merge branch '52383-ui-filter-assignee-none-any' into 'master'Sean McGivern2018-10-299-10/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add None/Any options for assignee in search bar Closes #52383 See merge request gitlab-org/gitlab-ce!22599
| * | | | | Fix testsHeinrich Lee Yu2018-10-262-2/+2
| | | | | |
| * | | | | Add changelogHeinrich Lee Yu2018-10-261-0/+5
| | | | | |
| * | | | | Add None/Any options for assignee in search barHeinrich Lee Yu2018-10-266-8/+31
| | | | | |
* | | | | | Merge branch '5781-operations-homepage-mvc-routes' into 'master'Sean McGivern2018-10-291-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport CE route changes for Ops Dashboard in EE See merge request gitlab-org/gitlab-ce!22640
| * | | | | | Backport CE route changes for Ops Dashboard in EE5781-operations-homepage-mvc-routesPeter Leitzen2018-10-271-0/+1
| | | | | | |
* | | | | | | Merge branch 'rz_fix_milestone_count' into 'master'Sean McGivern2018-10-299-84/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing count on Milestones Closes #50848 See merge request gitlab-org/gitlab-ce!21446
| * | | | | | | Update MR based on Sean's feedbackrz_fix_milestone_countEagllus2018-10-263-7/+7
| | | | | | | |
| * | | | | | | Removed the print in testRonald van Zon2018-10-251-3/+0
| | | | | | | |
| * | | | | | | Update related tests based on commentEagllus2018-10-221-6/+11
| | | | | | | |
| * | | | | | | Update related testsEagllus2018-10-181-3/+3
| | | | | | | |
| * | | | | | | Moving state_count to Milestone model and related testsEagllus2018-10-174-95/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By moving and improving state_count the functions in GlobalMilestone are no longer used.
| * | | | | | | Update code according comment recommendationsEagllus2018-10-163-7/+7
| | | | | | | |
| * | | | | | | Add test for the milestone countEagllus2018-10-041-0/+9
| | | | | | | |
| * | | | | | | Fixing count on MilestonesRonald van Zon2018-10-044-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding groups to milestones we can now include them in the count of Open and Closed.
* | | | | | | | Merge branch ↵Grzegorz Bizon2018-10-293-4/+24
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines' into 'master' Resolve "Stale pipeline status cache for `_project` after disabling pipelines" Closes #52780 See merge request gitlab-org/gitlab-ce!22589
| * | | | | | | Add test for caching nil status52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelinesMatija Čupić2018-10-261-0/+15
| | | | | | | |
| * | | | | | | Remove cache_sha parameterMatija Čupić2018-10-261-2/+2
| | | | | | | |
| * | | | | | | Add CHANGELOG entryMatija Čupić2018-10-251-0/+5
| | | | | | | |
| * | | | | | | Cache pipeline status only for specific shaMatija Čupić2018-10-251-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'docs-fix-links-1' into 'master'Evan Read2018-10-287-13/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update links to external sites See merge request gitlab-org/gitlab-ce!22578
| * | | | | | | | Update links to external sitesMarcel Amirault2018-10-247-13/+13
| | | | | | | | |
* | | | | | | | | Merge branch 'add-failure-reason-for-execution-timeout' into 'master'Kamil Trzciński2018-10-285-3/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add failure reason for execution timeout See merge request gitlab-org/gitlab-ce!22224
| * | | | | | | | | Add failure reason for execution timeoutShinya Maeda2018-10-285-3/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-autodevops-update' into 'master'Mike Lewis2018-10-271-9/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | remove duplicate section for enabling at project level See merge request gitlab-org/gitlab-ce!22627
| * | | | | | | | Clarify project-level enable/disabledocs-autodevops-updateDaniel Gruesso2018-10-261-3/+4
| | | | | | | | |
| * | | | | | | | remove duplicate section for enabling at project levelDaniel Gruesso2018-10-261-6/+0
| | | | | | | | |
* | | | | | | | | Merge branch '51335-fail-early-when-user-cannot-be-identified' into 'master'Douwe Maan2018-10-266-127/+98
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User not defined in PostReceive#process_project_changes Closes #51335 See merge request gitlab-org/gitlab-ce!22519
| * | | | | | | | | Removes idenfitication by commit from Gitlab::Identifier51335-fail-early-when-user-cannot-be-identifiedTiago Botelho2018-10-255-73/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we would need to identify a user when pushing through the GitLab UI. Since this is no longer the case we can remove the identification by commit and instead, use the identify_using_user
| * | | | | | | | | User not defined in PostReceive#process_project_changesTiago Botelho2018-10-254-62/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Gitlab::GitPostReceive#changes_refs is empty user would not get defined and nil would be passed to PostReceive#after_project_changes_hooks which would then throw an error.
* | | | | | | | | | Merge branch ↵Douwe Maan2018-10-2616-49/+322
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master' Adds trace of each access check when git push times out Closes #42790 See merge request gitlab-org/gitlab-ce!22265
| * | | | | | | | | | Bumps GitLab Shell version42790-improve-feedback-for-internal-git-access-checks-timeoutsTiago Botelho2018-10-261-1/+1
| | | | | | | | | | |
View Lorry Controller Status