Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-11-30
# Conflicts: # app/assets/javascripts/main.js # app/assets/javascripts/project.js # app/assets/javascripts/repo/lib/editor_options.js # app/helpers/button_helper.rb # app/models/environment.rb # spec/javascripts/repo/lib/editor_options_spec.js # spec/javascripts/repo/lib/editor_spec.js # spec/models/project_spec.rb [ci skip]
Showing
... | @@ -114,7 +114,7 @@ gem 'google-api-client', '~> 0.13.6' | ... | @@ -114,7 +114,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.7' | gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved | ||
# Search | # Search | ||
gem 'elasticsearch-model', '~> 0.1.9' | gem 'elasticsearch-model', '~> 0.1.9' | ||
... | ... |
db/fixtures/test/01_admin.rb
0 → 100644
spec/features/logout_spec.rb
0 → 100644
Please register or sign in to comment