summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Retain the empty linece-to-ee-2018-11-06Shinya Maeda2018-11-071-0/+1
* Fix conflictsShinya Maeda2018-11-073-29/+1
* Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-06GitLab Bot2018-11-0658-468/+629
|\
| * Merge branch 'allow_single_letter_external_issue_ids' into 'master'Douglas Barbosa Alexandre2018-11-063-7/+30
| |\
| | * Add specs for single-letter external tracker refsSean McGivern2018-11-061-5/+23
| | * Adding changelog entryDídac Rodríguez Arbonès2018-11-011-0/+5
| | * Allow single letter external issue IDsDídac Rodríguez Arbonès2018-11-011-2/+2
| * | Merge branch 'unindirect-fetch-remote' into 'master'Rémy Coutable2018-11-066-145/+98
| |\ \
| | * | Stop Repository#fetch_remote from using Gitlab::ShellNick Thomas2018-11-066-145/+98
| * | | Merge branch 'ce-jej/group-saml-sso-badges' into 'master'Robert Speicher2018-11-063-6/+19
| |\ \ \
| | * | | Add MembersPreloader to fix ActiveRecord copce-jej/group-saml-sso-badgesJames Edwards-Jones2018-11-022-6/+17
| | * | | EE render_if_exists for SSO badge in _member viewJames Edwards-Jones2018-10-241-0/+2
| * | | | Merge branch 'ccr/51052_keep_labels_on_issue' into 'master'Robert Speicher2018-11-064-5/+8
| |\ \ \ \
| | * | | | Fixed label removal from issueccr/51052_keep_labels_on_issueChantal Rollison2018-11-054-5/+8
| * | | | | 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 'jej/group-saml-sso-badges' into 'master'Robert Speicher2018-11-0614-7/+183
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Group SAML status badges on members pageJames Edwards-Jones2018-11-0514-7/+183
* | | | | | | | | | | | Merge branch 'move-worker-prepends' into 'master'Robert Speicher2018-11-064-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move EE prepend/include to the end of workersYorick Peterse2018-11-024-7/+8
* | | | | | | | | | | | | Merge branch 'move-presenter-prepends' into 'master'Robert Speicher2018-11-065-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move EE prepend/include to the end of presentersYorick Peterse2018-11-025-10/+10
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'move-policy-prepends' into 'master'Robert Speicher2018-11-069-17/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move EE prepend/include to the end of policiesYorick Peterse2018-11-059-17/+18
* | | | | | | | | | | | | | Merge branch 'ce-to-ee-2018-11-06' into 'master'Steve Azzopardi2018-11-0614-24/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Resolve conflict in app/assets/javascripts/reports/components/report_item.vueLukas Eipert2018-11-061-1/+1
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-06GitLab Bot2018-11-0619-25/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |