Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-08
# Conflicts: # app/models/project.rb # app/presenters/ci/pipeline_presenter.rb # app/views/projects/pipelines/_with_tabs.html.haml [ci skip]
Showing
... | ... | @@ -449,4 +449,4 @@ gem 'lograge', '~> 0.5' |
gem 'grape_logging', '~> 1.7' | ||
# Asset synchronization | ||
gem 'asset_sync', '~> 2.2.0' | ||
gem 'asset_sync', '~> 2.4' |
Please register or sign in to comment