diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 19:42:58 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 19:42:58 +0000 |
| commit | 3c19c971df0490772494e224405f13a0f98d6bf4 (patch) | |
| tree | ff78e561cbbfb49d66f135f8dbf638bf07bcff60 /GITLAB_SHELL_VERSION | |
| parent | a2479aaa1be00416f952eb79fa444328266c16b6 (diff) | |
| parent | 4ccbd556d98e002b1c521fd3dd7748fe1d9c4044 (diff) | |
| download | gitlab-ce-3c19c971df0490772494e224405f13a0f98d6bf4.tar.gz | |
Merge branch 'master' into 38869-datetime
* master: (112 commits)
small change to make less conflict with EE version
Add cop for use of remove_column
Resolve merge conflicts with dev.gitlab.org/master after security release
add index for doc/administration/operations/
Remove RubySampler#sample_objects for performance as well
Bugfix: User can't change the access level of an access requester
Add spec for removing issues.assignee_id
updated imports
Keep track of storage check timings
Remove a header level in the new 'Automatic CE->EE merge' doc
Improve down step of removing issues.assignee_id column
Fix specs after removing assignee_id field
Remove issues.assignee_id column
Resolve conflicts in app/models/user.rb
Fix image view mode
Do not raise when downstream pipeline is created
Remove the need for destroy and add a comment in the spec
Use build instead of create in importer spec
Simplify normalizing of paths
Remove allocation tracking code from InfluxDB sampler for performance
...
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 4e32c7b1caf..269fb5dfe2c 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -5.10.1 +5.10.2 |