Merge branches 'fix/import-data-issue' and 'master' of...
Merge branches 'fix/import-data-issue' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue
Showing
... | @@ -197,7 +197,7 @@ gem 'licensee', '~> 8.0.0' | ... | @@ -197,7 +197,7 @@ gem 'licensee', '~> 8.0.0' |
gem "rack-attack", '~> 4.3.1' | gem "rack-attack", '~> 4.3.1' | ||
# Ace editor | # Ace editor | ||
gem 'ace-rails-ap', '~> 2.0.1' | gem 'ace-rails-ap', '~> 4.0.2' | ||
# Keyboard shortcuts | # Keyboard shortcuts | ||
gem 'mousetrap-rails', '~> 1.4.6' | gem 'mousetrap-rails', '~> 1.4.6' | ||
... | @@ -218,7 +218,6 @@ gem 'gitlab_emoji', '~> 0.3.0' | ... | @@ -218,7 +218,6 @@ gem 'gitlab_emoji', '~> 0.3.0' |
gem 'gon', '~> 6.0.1' | gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.1.0' | gem 'jquery-rails', '~> 4.1.0' | ||
gem 'jquery-scrollto-rails', '~> 1.4.3' | |||
gem 'jquery-ui-rails', '~> 5.0.0' | gem 'jquery-ui-rails', '~> 5.0.0' | ||
gem 'raphael-rails', '~> 2.1.2' | gem 'raphael-rails', '~> 2.1.2' | ||
gem 'request_store', '~> 1.3.0' | gem 'request_store', '~> 1.3.0' | ||
... | @@ -242,7 +241,6 @@ group :development do | ... | @@ -242,7 +241,6 @@ group :development do |
gem "foreman" | gem "foreman" | ||
gem 'brakeman', '~> 3.2.0', require: false | gem 'brakeman', '~> 3.2.0', require: false | ||
gem "annotate", "~> 2.7.0" | |||
gem 'letter_opener_web', '~> 1.3.0' | gem 'letter_opener_web', '~> 1.3.0' | ||
gem 'quiet_assets', '~> 1.0.2' | gem 'quiet_assets', '~> 1.0.2' | ||
gem 'rerun', '~> 0.11.0' | gem 'rerun', '~> 0.11.0' | ||
... | ... |
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.
Please register or sign in to comment