summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflictsYorick Peterse2018-11-011-0/+1
* Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into '...Nick Thomas2018-10-293-4/+34
|\
| * Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-262-1/+18
| * 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.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 NFSLyle Kozloff2018-10-291-1/+18
|/ /
* | Merge branch 'ce-7103-show-milestone-dates-within-tooltips' into 'master'Phil Hughes2018-10-294-36/+52
|\ \
| * | 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 statusAlessio Caiazza2018-10-2922-118/+588
|/ / /
* | | Merge branch 'bw-update-issue-board-doc' into 'master'Marcia Ramos2018-10-291-2/+2
|\ \ \
| * | | 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 a commapiumn.l2018-10-261-1/+1
* | | | | Merge branch '34758-create-group-clusters' into 'master'Andreas Brandl2018-10-2913-3/+188
|\ \ \ \ \
| * | | | | Associate clusters model to groups34758-create-group-clustersThong Kuah2018-10-2913-3/+188
| | |_|/ / | |/| | |
* | | | | Merge branch '52383-ui-filter-assignee-none-any' into 'master'Sean McGivern2018-10-299-10/+38
|\ \ \ \ \
| * | | | | 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 EE5781-operations-homepage-mvc-routesPeter Leitzen2018-10-271-0/+1
* | | | | | | Merge branch 'rz_fix_milestone_count' into 'master'Sean McGivern2018-10-299-84/+77
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | 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
* | | | | | | | Merge branch '52780-stale-pipeline-status-cache-for-_project-after-disabling-...Grzegorz Bizon2018-10-293-4/+24
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | 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 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 timeoutShinya Maeda2018-10-285-3/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-autodevops-update' into 'master'Mike Lewis2018-10-271-9/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removes idenfitication by commit from Gitlab::Identifier51335-fail-early-when-user-cannot-be-identifiedTiago Botelho2018-10-255-73/+25
| * | | | | | | | | User not defined in PostReceive#process_project_changesTiago Botelho2018-10-254-62/+81
* | | | | | | | | | Merge branch '42790-improve-feedback-for-internal-git-access-checks-timeouts'...Douwe Maan2018-10-2616-49/+322
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bumps GitLab Shell version42790-improve-feedback-for-internal-git-access-checks-timeoutsTiago Botelho2018-10-261-1/+1
View Lorry Controller Status