Merge branch 'master' into 8-7-stable
Showing
source "https://rubygems.org" | source "https://rubygems.org" | ||
gem 'rails', '4.2.5.2' | gem 'rails', '4.2.6' | ||
gem 'rails-deprecated_sanitizer', '~> 1.0.3' | gem 'rails-deprecated_sanitizer', '~> 1.0.3' | ||
# Responders respond_to and respond_with | # Responders respond_to and respond_with | ||
... | @@ -8,7 +8,7 @@ gem 'responders', '~> 2.0' | ... | @@ -8,7 +8,7 @@ gem 'responders', '~> 2.0' |
# Specify a sprockets version due to increased performance | # Specify a sprockets version due to increased performance | ||
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 | # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 | ||
gem 'sprockets', '~> 3.3.5' | gem 'sprockets', '~> 3.6.0' | ||
# Default values for AR models | # Default values for AR models | ||
gem "default_value_for", "~> 3.0.0" | gem "default_value_for", "~> 3.0.0" | ||
... | @@ -149,6 +149,10 @@ gem 'version_sorter', '~> 2.0.0' | ... | @@ -149,6 +149,10 @@ gem 'version_sorter', '~> 2.0.0' |
# Cache | # Cache | ||
gem "redis-rails", '~> 4.0.0' | gem "redis-rails", '~> 4.0.0' | ||
# Redis | |||
gem 'redis', '~> 3.2' | |||
gem 'connection_pool', '~> 2.0' | |||
# Campfire integration | # Campfire integration | ||
gem 'tinder', '~> 1.10.0' | gem 'tinder', '~> 1.10.0' | ||
... | @@ -229,14 +233,13 @@ group :metrics do | ... | @@ -229,14 +233,13 @@ group :metrics do |
gem 'allocations', '~> 1.0', require: false, platform: :mri | gem 'allocations', '~> 1.0', require: false, platform: :mri | ||
gem 'method_source', '~> 0.8', require: false | gem 'method_source', '~> 0.8', require: false | ||
gem 'influxdb', '~> 0.2', require: false | gem 'influxdb', '~> 0.2', require: false | ||
gem 'connection_pool', '~> 2.0', require: false | |||
end | end | ||
group :development do | group :development do | ||
gem "foreman" | gem "foreman" | ||
gem 'brakeman', '~> 3.2.0', require: false | gem 'brakeman', '~> 3.2.0', require: false | ||
gem "annotate", "~> 2.6.0" | gem "annotate", "~> 2.7.0" | ||
gem "letter_opener", '~> 1.1.2' | gem "letter_opener", '~> 1.1.2' | ||
gem 'quiet_assets', '~> 1.0.2' | gem 'quiet_assets', '~> 1.0.2' | ||
gem 'rerun', '~> 0.11.0' | gem 'rerun', '~> 0.11.0' | ||
... | @@ -282,9 +285,9 @@ group :development, :test do | ... | @@ -282,9 +285,9 @@ group :development, :test do |
gem 'teaspoon', '~> 1.1.0' | gem 'teaspoon', '~> 1.1.0' | ||
gem 'teaspoon-jasmine', '~> 2.2.0' | gem 'teaspoon-jasmine', '~> 2.2.0' | ||
gem 'spring', '~> 1.6.4' | gem 'spring', '~> 1.7.0' | ||
gem 'spring-commands-rspec', '~> 1.0.4' | gem 'spring-commands-rspec', '~> 1.0.4' | ||
gem 'spring-commands-spinach', '~> 1.0.0' | gem 'spring-commands-spinach', '~> 1.1.0' | ||
gem 'spring-commands-teaspoon', '~> 0.0.2' | gem 'spring-commands-teaspoon', '~> 0.0.2' | ||
gem 'rubocop', '~> 0.38.0', require: false | gem 'rubocop', '~> 0.38.0', require: false | ||
... | ... |
app/helpers/form_helper.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/gon_helper.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/factories/commits.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/lib/gitlab_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment