Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Retain the empty linece-to-ee-2018-11-06 | Shinya Maeda | 2018-11-07 | 1 | -0/+1 |
* | Fix conflicts | Shinya Maeda | 2018-11-07 | 3 | -29/+1 |
* | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-06 | GitLab Bot | 2018-11-06 | 58 | -468/+629 |
|\ | |||||
| * | Merge branch 'allow_single_letter_external_issue_ids' into 'master' | Douglas Barbosa Alexandre | 2018-11-06 | 3 | -7/+30 |
| |\ | |||||
| | * | Add specs for single-letter external tracker refs | Sean McGivern | 2018-11-06 | 1 | -5/+23 |
| | * | Adding changelog entry | Dídac Rodríguez Arbonès | 2018-11-01 | 1 | -0/+5 |
| | * | Allow single letter external issue IDs | Dídac Rodríguez Arbonès | 2018-11-01 | 1 | -2/+2 |
| * | | Merge branch 'unindirect-fetch-remote' into 'master' | Rémy Coutable | 2018-11-06 | 6 | -145/+98 |
| |\ \ | |||||
| | * | | Stop Repository#fetch_remote from using Gitlab::Shell | Nick Thomas | 2018-11-06 | 6 | -145/+98 |
| * | | | Merge branch 'ce-jej/group-saml-sso-badges' into 'master' | Robert Speicher | 2018-11-06 | 3 | -6/+19 |
| |\ \ \ | |||||
| | * | | | Add MembersPreloader to fix ActiveRecord copce-jej/group-saml-sso-badges | James Edwards-Jones | 2018-11-02 | 2 | -6/+17 |
| | * | | | EE render_if_exists for SSO badge in _member view | James Edwards-Jones | 2018-10-24 | 1 | -0/+2 |
| * | | | | Merge branch 'ccr/51052_keep_labels_on_issue' into 'master' | Robert Speicher | 2018-11-06 | 4 | -5/+8 |
| |\ \ \ \ | |||||
| | * | | | | Fixed label removal from issueccr/51052_keep_labels_on_issue | Chantal Rollison | 2018-11-05 | 4 | -5/+8 |
| * | | | | | Merge branch '25140-disable-stop-button' into 'master' | Phil Hughes | 2018-11-06 | 5 | -9/+40 |
| |\ \ \ \ \ | |||||
| | * | | | | | Disable stop environment button while deployment is running | Filipa Lacerda | 2018-11-06 | 5 | -9/+40 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'rake-gitaly-check' into 'master' | Rémy Coutable | 2018-11-06 | 3 | -118/+29 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add gitlab:gitaly:check task for Gitaly health checkrake-gitaly-check | Alejandro Rodríguez | 2018-10-23 | 3 | -118/+29 |
| * | | | | | | Merge branch 'dz-add-packages-to-yml' into 'master' | Marin Jankovski | 2018-11-06 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add packages section to CE config filedz-add-packages-to-yml | Dmitriy Zaporozhets | 2018-10-05 | 1 | -0/+4 |
| * | | | | | | | Merge branch '49403-redesign-activity-feed' into 'master' | Annabel Dunstone Gray | 2018-11-06 | 20 | -107/+146 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Resolve "Redesign activity feed" | Martin Wortschack | 2018-11-06 | 20 | -107/+146 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'restore-resource-user-via-browser-qa' into 'master' | Douglas Barbosa Alexandre | 2018-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Restore changes from:restore-resource-user-via-browser-qa | Lin Jen-Shin | 2018-11-06 | 1 | -1/+1 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'support-project-security-dashboard' into 'master' | Grzegorz Bizon | 2018-11-06 | 2 | -5/+19 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Backport support project security dashboard changessupport-project-security-dashboard | Kamil Trzciński | 2018-11-06 | 2 | -5/+19 |
| * | | | | | | | | Merge branch 'stateful_deployments' into 'master' | Kamil Trzciński | 2018-11-06 | 55 | -579/+1265 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Prevent nil exception in environment statusstateful_deployments | Shinya Maeda | 2018-11-06 | 1 | -2/+2 |
| | * | | | | | | | | Fix flaky spec | Shinya Maeda | 2018-11-06 | 1 | -5/+6 |
| | * | | | | | | | | Fix spec | Shinya Maeda | 2018-11-06 | 2 | -16/+1 |
| | * | | | | | | | | Use fire_state_event | Shinya Maeda | 2018-11-06 | 1 | -1/+1 |
| | * | | | | | | | | Create deployments only if action: start | Shinya Maeda | 2018-11-06 | 4 | -1/+29 |
| | * | | | | | | | | Squashed commit of the following: | Shinya Maeda | 2018-11-06 | 54 | -407/+1079 |
| * | | | | | | | | | Merge branch 'revert-drop-gcp-clusters-table' into 'master' | Steve Azzopardi | 2018-11-06 | 3 | -58/+32 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Revert Drop gcp_clusters tablerevert-drop-gcp-clusters-table | Shinya Maeda | 2018-11-06 | 3 | -58/+32 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'remove-experimental-label-from-cluster-views' into 'master' | Kamil Trzciński | 2018-11-06 | 8 | -19/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Removes experimental label from cluster viewsremove-experimental-label-from-cluster-views | Mayra Cabrera | 2018-11-05 | 8 | -19/+10 |
| * | | | | | | | | | | Merge branch '51716-add-kubernetes-namespace-background-migration' into 'master' | Andreas Brandl | 2018-11-06 | 4 | -0/+202 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Add background migration for Kubernetes Namespaces | Mayra Cabrera | 2018-11-06 | 4 | -0/+202 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jej/group-saml-sso-badges' into 'master' | Robert Speicher | 2018-11-06 | 14 | -7/+183 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Group SAML status badges on members page | James Edwards-Jones | 2018-11-05 | 14 | -7/+183 |
* | | | | | | | | | | | | Merge branch 'move-worker-prepends' into 'master' | Robert Speicher | 2018-11-06 | 4 | -7/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Move EE prepend/include to the end of workers | Yorick Peterse | 2018-11-02 | 4 | -7/+8 |
* | | | | | | | | | | | | | Merge branch 'move-presenter-prepends' into 'master' | Robert Speicher | 2018-11-06 | 5 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Move EE prepend/include to the end of presenters | Yorick Peterse | 2018-11-02 | 5 | -10/+10 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'move-policy-prepends' into 'master' | Robert Speicher | 2018-11-06 | 9 | -17/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Move EE prepend/include to the end of policies | Yorick Peterse | 2018-11-05 | 9 | -17/+18 |
* | | | | | | | | | | | | | | Merge branch 'ce-to-ee-2018-11-06' into 'master' | Steve Azzopardi | 2018-11-06 | 14 | -24/+89 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Resolve conflict in app/assets/javascripts/reports/components/report_item.vue | Lukas Eipert | 2018-11-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-06 | GitLab Bot | 2018-11-06 | 19 | -25/+124 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |