Merge branch 'master' into add-university-content
Showing
... | @@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' | ... | @@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' |
# Responders respond_to and respond_with | # Responders respond_to and respond_with | ||
gem 'responders', '~> 2.0' | gem 'responders', '~> 2.0' | ||
# Specify a sprockets version due to increased performance | gem 'sprockets', '~> 3.7.0' | ||
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 | gem 'sprockets-es6', '~> 0.9.2' | ||
gem 'sprockets', '~> 3.6.0' | |||
gem 'sprockets-es6' | |||
# Default values for AR models | # Default values for AR models | ||
gem 'default_value_for', '~> 3.0.0' | gem 'default_value_for', '~> 3.0.0' | ||
... | @@ -122,8 +120,8 @@ gem 'diffy', '~> 3.0.3' | ... | @@ -122,8 +120,8 @@ gem 'diffy', '~> 3.0.3' |
# Application server | # Application server | ||
group :unicorn do | group :unicorn do | ||
gem 'unicorn', '~> 4.9.0' | gem 'unicorn', '~> 5.1.0' | ||
gem 'unicorn-worker-killer', '~> 0.4.2' | gem 'unicorn-worker-killer', '~> 0.4.4' | ||
end | end | ||
# State machine | # State machine | ||
... | @@ -212,7 +210,7 @@ gem 'oj', '~> 2.17.4' | ... | @@ -212,7 +210,7 @@ gem 'oj', '~> 2.17.4' |
gem 'chronic', '~> 0.10.2' | gem 'chronic', '~> 0.10.2' | ||
gem 'chronic_duration', '~> 0.10.6' | gem 'chronic_duration', '~> 0.10.6' | ||
gem 'sass-rails', '~> 5.0.0' | gem 'sass-rails', '~> 5.0.6' | ||
gem 'coffee-rails', '~> 4.1.0' | gem 'coffee-rails', '~> 4.1.0' | ||
gem 'uglifier', '~> 2.7.2' | gem 'uglifier', '~> 2.7.2' | ||
gem 'turbolinks', '~> 2.5.0' | gem 'turbolinks', '~> 2.5.0' | ||
... | ... |
spec/features/dashboard/snippets_spec.rb
0 → 100644
spec/features/projects/snippets_spec.rb
0 → 100644
spec/features/snippets_spec.rb
0 → 100644
spec/support/snippets_shared_examples.rb
0 → 100644
Please
register
or
sign in
to comment