Merge branch 'master' into issue_14800
# Conflicts: # app/assets/stylesheets/framework/variables.scss
Showing
... | @@ -214,7 +214,7 @@ gem 'jquery-rails', '~> 4.0.0' | ... | @@ -214,7 +214,7 @@ gem 'jquery-rails', '~> 4.0.0' |
gem 'jquery-scrollto-rails', '~> 1.4.3' | 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.2.0' | gem 'request_store', '~> 1.3.0' | ||
gem 'select2-rails', '~> 3.5.9' | gem 'select2-rails', '~> 3.5.9' | ||
gem 'virtus', '~> 1.0.1' | gem 'virtus', '~> 1.0.1' | ||
gem 'net-ssh', '~> 3.0.1' | gem 'net-ssh', '~> 3.0.1' | ||
... | ... |
doc/update/8.6-to-8.7.md
0 → 100644
lib/gitlab/routing.rb
0 → 100644
Please register or sign in to comment