From 96d58433c9a657a30f464c91b69e5ac472f4e6a2 Mon Sep 17 00:00:00 2001 From: utilum Date: Sat, 17 Jun 2017 18:59:41 +0200 Subject: Fixes FIXME: rb-inotify 0.99 has been released --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 2a1b9fa7ef..9023eaca35 100644 --- a/Gemfile +++ b/Gemfile @@ -33,8 +33,7 @@ gem "bcrypt", "~> 3.1.11", require: false # sprockets. gem "uglifier", ">= 1.3.0", require: false -# FIXME: Pending rb-inotify 0.9.9 release -gem "rb-inotify", github: "guard/rb-inotify", branch: "master", require: false +gem "rb-inotify", require: false # Explicitly avoid 1.x that doesn't support Ruby 2.4+ gem "json", ">= 2.0.0" -- cgit v1.2.3 From cfade1ec7ee7b5b51f3c1578e3474f9c156f2971 Mon Sep 17 00:00:00 2001 From: Kir Shatrov Date: Thu, 22 Jun 2017 22:59:18 -0400 Subject: Enforce frozen string in Rubocop --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 23b9b34b77..1a62782cbe 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ +# frozen_string_literal: true source "https://rubygems.org" git_source(:github) do |repo_name| -- cgit v1.2.3 From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Sun, 2 Jul 2017 02:15:17 +0930 Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string" This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa. --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 1a62782cbe..23b9b34b77 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ -# frozen_string_literal: true source "https://rubygems.org" git_source(:github) do |repo_name| -- cgit v1.2.3 From 44f3ecbe5f3cb531164ed9bb14c58781281113ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 7 Jul 2017 15:16:39 -0400 Subject: Test thor master --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 23b9b34b77..1fbf223d64 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ gem "arel", github: "rails/arel" # We need a newish Rake since Active Job sets its test tasks' descriptions. gem "rake", ">= 11.1" +gem "thor", github: "erikhuda/thor" # This needs to be with require false to ensure correct loading order, as it has to # be loaded after loading the test library. -- cgit v1.2.3