diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-25 19:52:07 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-25 19:52:07 +0800 |
commit | 209c4c5e3ef0f6f0fe1c0c0cd2271e450d8790bc (patch) | |
tree | a30f215b28095ee4b0d457ee1cb916023fbee139 /GITLAB_SHELL_VERSION | |
parent | ca7e1058e8d91a01157ac7d9170423e16a732850 (diff) | |
parent | f9b946c1c9756533fd95c8735803d7b54d6dd204 (diff) | |
download | gitlab-ce-209c4c5e3ef0f6f0fe1c0c0cd2271e450d8790bc.tar.gz |
Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenario
* upstream/master: (136 commits)
Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
Add modal for deleting a milestone
Revert "Merge branch 'remove-rugged-walk' into 'master'"
Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"
Update CHANGELOG.md for 10.4.1
Add a gRPC health check to ensure Gitaly is up
Add formatted_data attribute to Git::WikiPage
Avoid array indices to fixtures in JS specs
Migrate .batch_lfs_pointers to Gitaly
Updates `Revert this merge request` text
Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
Workaround a recaptcha pop-up that cannot be tested
Uses sprite icon to render verified commit badge and uniforms css colors
Moves more mr widget components into vue files Adds i18n Adds better test coverage
Execute system hooks after-commit when executing project hooks
Remove one Spinach job and add one RSpec job
Remove callback as we already update accordingly on services
Fix typo in `.gitlab-ci.yml` heading
Migrate repository bundling to Gitaly
...
Diffstat (limited to 'GITLAB_SHELL_VERSION')
-rw-r--r-- | GITLAB_SHELL_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index c68d476cc8e..9b9a244206f 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -5.11.0 +6.0.2 |