diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-23 10:32:14 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-23 10:32:14 +0300 |
| commit | 519ffa1ebf6eff8c7fee1e7aa919b44c1acfeb36 (patch) | |
| tree | e2a96f675fbf8fed86568b64723b856ebd5012d9 /Gemfile.lock | |
| parent | 1e78c627d4c6630df3bbfd4e905018314d692b6d (diff) | |
| parent | 5d74973d8148548f505478ed773795d377e6f0d6 (diff) | |
| download | gitlab-ce-519ffa1ebf6eff8c7fee1e7aa919b44c1acfeb36.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
* master: (297 commits)
Fix deletion of container registry or images returning an error
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
Decrease ABC threshold to 54.28
Update VERSION to 10.2.0-pre
Update CHANGELOG.md for 10.1.0
Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
Fix the external URLs generated for online view of HTML artifacts
Use title as placeholder instead of issue title for reusability
Fix failure in current_settings_spec.rb
Clarify the difference between project_update and project_rename
URI decode Page-Title header to preserve UTF-8 characters
Update Gitaly version to v0.49.0
Decrease Perceived Complexity threshold to 14
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
Force non diff resolved discussion to display when collapse toggled
Added submodule support in multi-file editor
add note about after_script being run separately
Check for element before evaluate_script
Merge branch 'master-i18n' into 'master'
Update Prometheus gem to fix problems with other files overwriting current file
...
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5bf1d6a8bc2..09029870642 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.1.0) + fog-aliyun (0.2.0) fog-core (~> 1.27) fog-json (~> 1.0) ipaddress (~> 0.8) @@ -274,7 +274,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.41.0) + gitaly-proto (0.45.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -325,7 +325,9 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.4.0.2) + google-protobuf (3.4.1.1) + googleapis-common-protos-types (1.0.0) + google-protobuf (~> 3.0) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -352,8 +354,9 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.6.0) + grpc (1.6.6) google-protobuf (~> 3.1) + googleapis-common-protos-types (~> 1.0.0) googleauth (~> 0.5.1) haml (4.0.7) tilt @@ -616,7 +619,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta14) + prometheus-client-mmap (0.7.0.beta17) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) @@ -1008,7 +1011,7 @@ DEPENDENCIES flay (~> 2.8.0) flipper (~> 0.10.2) flipper-active_record (~> 0.10.2) - fog-aliyun (~> 0.1.0) + fog-aliyun (~> 0.2.0) fog-aws (~> 1.4) fog-core (~> 1.44) fog-google (~> 0.5) @@ -1023,7 +1026,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.41.0) + gitaly-proto (~> 0.45.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) @@ -1098,7 +1101,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta14) + prometheus-client-mmap (~> 0.7.0.beta17) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |