Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-17
# Conflicts: # Gemfile.lock # app/assets/javascripts/dispatcher.js # changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml # spec/requests/api/jobs_spec.rb # spec/requests/api/v3/builds_spec.rb [ci skip]
Showing
... | @@ -118,7 +118,7 @@ gem 'google-api-client', '~> 0.13.6' | ... | @@ -118,7 +118,7 @@ gem 'google-api-client', '~> 0.13.6' |
gem 'unf', '~> 0.1.4' | gem 'unf', '~> 0.1.4' | ||
# Seed data | # Seed data | ||
gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved | gem 'seed-fu', '~> 2.3.7' | ||
# Search | # Search | ||
gem 'elasticsearch-model', '~> 0.1.9' | gem 'elasticsearch-model', '~> 0.1.9' | ||
... | ... |
Please register or sign in to comment