summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finderDouwe Maan2018-11-06535-3760/+7738
|\
| * Merge branch '25140-disable-stop-button' into 'master'Phil Hughes2018-11-065-9/+40
| |\
| | * Disable stop environment button while deployment is runningFilipa Lacerda2018-11-065-9/+40
| |/
| * Merge branch 'rake-gitaly-check' into 'master'Rémy Coutable2018-11-063-118/+29
| |\
| | * Add gitlab:gitaly:check task for Gitaly health checkrake-gitaly-checkAlejandro Rodríguez2018-10-233-118/+29
| * | Merge branch 'dz-add-packages-to-yml' into 'master'Marin Jankovski2018-11-061-0/+4
| |\ \
| | * | Add packages section to CE config filedz-add-packages-to-ymlDmitriy Zaporozhets2018-10-051-0/+4
| * | | Merge branch '49403-redesign-activity-feed' into 'master'Annabel Dunstone Gray2018-11-0620-107/+146
| |\ \ \
| | * | | Resolve "Redesign activity feed"Martin Wortschack2018-11-0620-107/+146
| |/ / /
| * | | Merge branch 'restore-resource-user-via-browser-qa' into 'master'Douglas Barbosa Alexandre2018-11-061-1/+1
| |\ \ \
| | * | | Restore changes from:restore-resource-user-via-browser-qaLin Jen-Shin2018-11-061-1/+1
| * | | | Merge branch 'support-project-security-dashboard' into 'master'Grzegorz Bizon2018-11-062-5/+19
| |\ \ \ \
| | * | | | Backport support project security dashboard changessupport-project-security-dashboardKamil Trzciński2018-11-062-5/+19
| * | | | | Merge branch 'stateful_deployments' into 'master'Kamil Trzciński2018-11-0655-579/+1265
| |\ \ \ \ \
| | * | | | | Prevent nil exception in environment statusstateful_deploymentsShinya Maeda2018-11-061-2/+2
| | * | | | | Fix flaky specShinya Maeda2018-11-061-5/+6
| | * | | | | Fix specShinya Maeda2018-11-062-16/+1
| | * | | | | Use fire_state_eventShinya Maeda2018-11-061-1/+1
| | * | | | | Create deployments only if action: startShinya Maeda2018-11-064-1/+29
| | * | | | | Squashed commit of the following:Shinya Maeda2018-11-0654-407/+1079
| * | | | | | Merge branch 'revert-drop-gcp-clusters-table' into 'master'Steve Azzopardi2018-11-063-58/+32
| |\ \ \ \ \ \
| | * | | | | | Revert Drop gcp_clusters tablerevert-drop-gcp-clusters-tableShinya Maeda2018-11-063-58/+32
| | |/ / / / /
| * | | | | | Merge branch 'remove-experimental-label-from-cluster-views' into 'master'Kamil Trzciński2018-11-068-19/+10
| |\ \ \ \ \ \
| | * | | | | | Removes experimental label from cluster viewsremove-experimental-label-from-cluster-viewsMayra Cabrera2018-11-058-19/+10
| * | | | | | | Merge branch '51716-add-kubernetes-namespace-background-migration' into 'master'Andreas Brandl2018-11-064-0/+202
| |\ \ \ \ \ \ \
| | * | | | | | | Add background migration for Kubernetes NamespacesMayra Cabrera2018-11-064-0/+202
| |/ / / / / / /
| * | | | | | | Merge branch '7737-ci-pipeline-view-slowed-down-massivly-if-security-tabs-has...Phil Hughes2018-11-067-68/+197
| |\ \ \ \ \ \ \
| | * | | | | | | Improve performance of rendering large reports7737-ci-pipeline-view-slowed-down-massivly-if-security-tabs-has-many-entriesLukas Eipert2018-11-067-68/+197
| * | | | | | | | Merge branch '53533-fix-broken-link' into 'master'Phil Hughes2018-11-065-4/+9
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Renders unescaped `sprinft` stringFilipa Lacerda2018-11-065-4/+9
| |/ / / / / / /
| * | | | | | | Merge branch '18933-render-index-like-readme' into 'master'Rémy Coutable2018-11-065-7/+48
| |\ \ \ \ \ \ \
| | * | | | | | | Remove extra whitespace on markup_helper.rb18933-render-index-like-readmeJames Lopez2018-11-021-1/+1
| | * | | | | | | Refactor MarkupHelper to add INDEX plain filenameJames Lopez2018-11-021-4/+9
| | * | | | | | | Add docs for README and index filesAchilleas Pipinellis2018-11-021-1/+27
| | * | | | | | | Test type of README file without extensionAchilleas Pipinellis2018-11-022-3/+4
| | * | | | | | | Correct MR number in changelogAchilleas Pipinellis2018-11-021-1/+1
| | * | | | | | | Render index.* like README.* when it's present in a directoryJakub Jirutka2018-11-023-2/+11
| * | | | | | | | Merge branch '34758-unique-environment-scope' into 'master'34758-group-level-kubernetes-cluster-configurationDmitriy Zaporozhets2018-11-061-6/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Sync `groups` and `group` to fix validation34758-unique-environment-scopeThong Kuah2018-11-031-6/+11
| * | | | | | | | | Merge branch 'sh-fix-issue-8040-ee' into 'master'Phil Hughes2018-11-062-11/+24
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix save button not activating when original setting started as nullStan Hu2018-11-062-11/+24
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ce-fix_vuln_list_on_group_dashboard' into 'master'Kamil Trzciński2018-11-064-0/+34
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Backport generic methods to CEce-fix_vuln_list_on_group_dashboardOlivier Gonzalez2018-11-054-0/+34
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'dimitrieh-master-patch-39313' into 'master'Rémy Coutable2018-11-061-0/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Includes the way approvals are handled to the documentationDimitrie Hoekstra2018-11-061-0/+6
| |/ / / / / / / /
| * | | | | | | | Merge branch 'tc-fix-failing-awardable-spec' into 'master'Douwe Maan2018-11-061-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Don't care about order when getting awarded issuesToon Claes2018-11-061-2/+2
| |/ / / / / / /
| * | | | | | | Merge branch '53224-rename-to-resource-base-qa' into 'master'Douglas Barbosa Alexandre2018-11-0585-1615/+1601
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Rename QA::Factory to QA::Resource53224-rename-to-resource-base-qaLin Jen-Shin2018-11-0585-1615/+1601
| * | | | | | | Merge branch 'fix-codequality' into 'master'testing-review-app-passwordGrzegorz Bizon2018-11-052-2/+2
| |\ \ \ \ \ \ \