diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-30 14:20:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 14:20:25 +0100 |
| commit | 7f24242ef6d3e6b64f9116dedc3ad60048b4c1bc (patch) | |
| tree | da19d2883856a99ba2a0b7caddff8b67683a070a /Gemfile | |
| parent | 7ec3f6022d5c991bb584c481a29c416e9f1c5438 (diff) | |
| parent | 48be335f4f64c5513bb4b0d760225ceca78416c2 (diff) | |
Merge pull request #801 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index c818cba37..49d78d273 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ gem 'link_header', '~> 0.0' gem 'mime-types', '~> 3.2', require: 'mime/types/columnar' gem 'nokogiri', '~> 1.8' gem 'nsa', '~> 0.2' -gem 'oj', '~> 3.6' +gem 'oj', '~> 3.7' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.10' gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' @@ -96,7 +96,7 @@ gem 'rdf-normalize', '~> 0.3' group :development, :test do gem 'fabrication', '~> 2.20' gem 'fuubar', '~> 2.3' - gem 'i18n-tasks', '~> 0.9', require: false, git: 'https://github.com/glebm/i18n-tasks.git', branch: 'master', ref: 'a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f' + gem 'i18n-tasks', '~> 0.9', require: false gem 'pry-byebug', '~> 3.6' gem 'pry-rails', '~> 0.3' gem 'rspec-rails', '~> 3.8' |