Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/autocomplete_controller.rb
app/controllers/omniauth_callbacks_controller.rb
app/controllers/projects/services_controller.rb
app/helpers/projects_helper.rb
app/services/audit_event_service.rb
db/schema.rb
doc/api/users.md
doc/update/6.x-or-7.x-to-7.13.md
features/project/project.feature
Showing
... | ... | @@ -204,7 +204,7 @@ gem 'jquery-ui-rails' |
gem 'nprogress-rails' | ||
gem 'raphael-rails', '~> 2.1.2' | ||
gem 'request_store' | ||
gem 'select2-rails' | ||
gem 'select2-rails', '~> 3.5.9' | ||
gem 'virtus' | ||
gem "gitlab-license", "~> 0.0.2" | ||
... | ... | @@ -234,26 +234,20 @@ group :development, :test do |
gem 'fuubar', '~> 2.0.0' | ||
gem 'pry-rails' | ||
gem 'coveralls', require: false | ||
gem 'coveralls', '~> 0.8.2', require: false | ||
gem 'database_cleaner', '~> 1.4.0' | ||
gem 'factory_girl_rails' | ||
gem 'rspec-rails', '~> 3.3.0' | ||
gem 'rubocop', '0.28.0', require: false | ||
gem 'rspec-rails', '~> 3.3.0' | ||
gem 'rubocop', '0.28.0', require: false | ||
gem 'spinach-rails' | ||
# rest-client is a coveralls dependency and not used directly in GitLab, but | ||
# we specify a version here to pick up some security fixes. | ||
# See https://github.com/rest-client/rest-client/issues/369 | ||
# and http://www.osvdb.org/show/osvdb/117461 | ||
gem 'rest-client', '~> 1.8.0' | ||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) | ||
gem 'minitest', '~> 5.3.0' | ||
# Generate Fake data | ||
gem 'ffaker', '~> 2.0.0' | ||
gem 'capybara', '~> 2.3.0' | ||
gem 'capybara', '~> 2.4.0' | ||
gem 'capybara-screenshot', '~> 1.0.0' | ||
gem 'poltergeist', '~> 1.6.0' | ||
... | ... |
5.96 KB
7.94 KB
3.41 KB
4.88 KB
2.7 KB
doc/api/settings.md
0 → 100644
2.01 KB
5.93 KB
4.93 KB
doc/update/7.12-to-7.13.md
0 → 100644
docker/fig.yml
0 → 100644
docker/marathon.json
0 → 100644
lib/api/settings.rb
0 → 100644