diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-06 17:40:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 17:40:43 +0100 |
| commit | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (patch) | |
| tree | 1fb5c57e634a16136e764178e2e1ca1d0e009a25 /Gemfile | |
| parent | 4167ed375bd9402e91a998fad8f173fa76b2eec3 (diff) | |
| parent | 24822eca73ac2bc37870bd27cae8ee6b17785759 (diff) | |
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile index 8bb9ab326..680e71411 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ ruby '>= 2.3.0', '< 2.6.0' gem 'pkg-config', '~> 1.3' gem 'puma', '~> 3.12' -gem 'rails', '~> 5.2.1' +gem 'rails', '~> 5.2.2' gem 'thor', '~> 0.20' gem 'hamlit-rails', '~> 0.2' @@ -108,7 +108,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.11' + gem 'capybara', '~> 3.12' gem 'climate_control', '~> 0.2' gem 'faker', '~> 1.9' gem 'microformats', '~> 4.0' @@ -128,7 +128,7 @@ group :development do gem 'letter_opener', '~> 1.4' gem 'letter_opener_web', '~> 1.3' gem 'memory_profiler' - gem 'rubocop', '~> 0.60', require: false + gem 'rubocop', '~> 0.61', require: false gem 'brakeman', '~> 4.3', require: false gem 'bundler-audit', '~> 0.6', require: false gem 'scss_lint', '~> 0.57', require: false |