diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-02-09 18:24:39 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-02-09 18:24:39 +0800 |
| commit | 4061d29108ac0358304d46ab39723ad805f29223 (patch) | |
| tree | 2e5cdd8dcbdeddb506e58032171d7ae2bc735178 /GITLAB_SHELL_VERSION | |
| parent | 5f62a935c3522517bffb6f4e0f48271dd81a9f39 (diff) | |
| parent | 7534f7a892d6e8c50475720e387b8689c94582da (diff) | |
| download | gitlab-ce-4061d29108ac0358304d46ab39723ad805f29223.tar.gz | |
Merge remote-tracking branch 'upstream/master' into qa-allow-setting-sandbox-group
* upstream/master: (27 commits)
Set initial password for instance in LDAP QA test
Backport EE changes to some hashed storage documentation to CE
Remove allow_n_plus_1 from Git::Repository#branches_filter
Bumps Gitlab Shell version to 6.0.3
Make resetting column information overridable in EE
Added 'clear' button to ci lint editor
Issues and merge requests in subgroups docs
Update docs labels CE
Refactored merge_requests/show path in dispatcher.js
wording
don't check against a hardcoded user name
10.5 Update the dependencies license list
10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates
Create update guide for 10.5
Update 10.5 source install guide
Add docs for MR link in commit page
Add groups to OpenID Connect claims
Replaced $.get with axois.get
Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly
[docs] Info rescheduling background migrations
...
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 9b9a244206f..090ea9dad19 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -6.0.2 +6.0.3 |