diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-06 15:30:34 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-06 15:30:34 +0100 |
| commit | 996e802415aa1edadb96b1f7efa924581fb047ed (patch) | |
| tree | 316dd7319d2cc723b5c311f099065e9b4fdb11d6 /Gemfile | |
| parent | a0eaff14124b829ccc02df951bd7cb7d3abb7708 (diff) | |
| parent | dcfda304aa8c06f427cb5672ceb4e070047436be (diff) | |
| download | gitlab-ce-996e802415aa1edadb96b1f7efa924581fb047ed.tar.gz | |
Merge branch 'master' into members-ui
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -130,7 +130,7 @@ gem 'state_machines-activerecord', '~> 0.4.0' gem 'after_commit_queue', '~> 1.3.0' # Issue tags -gem 'acts-as-taggable-on', '~> 3.4' +gem 'acts-as-taggable-on', '~> 4.0' # Background jobs gem 'sidekiq', '~> 4.2' @@ -231,7 +231,7 @@ gem 'net-ssh', '~> 3.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 1.1.0' +gem 'sentry-raven', '~> 2.0.0' gem 'premailer-rails', '~> 1.9.0' @@ -295,7 +295,7 @@ group :development, :test do gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'rubocop', '~> 0.42.0', require: false + gem 'rubocop', '~> 0.43.0', require: false gem 'rubocop-rspec', '~> 1.5.0', require: false gem 'scss_lint', '~> 0.47.0', require: false gem 'haml_lint', '~> 0.18.2', require: false |