summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-03-25 12:54:40 -0600
committerconnorshea <connor.james.shea@gmail.com>2016-03-25 12:54:40 -0600
commitf784393213b3402467465dca5c81643ae700c55d (patch)
tree775a9effcfa585b430e0873af172f2eb96be0dd0 /Gemfile.lock
parent28c94ee955888c48547c02f5d60698faa7aa7b58 (diff)
downloadgitlab-ce-f784393213b3402467465dca5c81643ae700c55d.tar.gz
Upgrade coffee-rails from 4.1.0 to 4.1.1
Includes Rails 5 support. See Changelog for more info (https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md#411-dece mber-18-2015)
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 16c09ab6e6d..c27895a0af0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,9 +128,9 @@ GEM
coderay (1.1.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
- coffee-rails (4.1.0)
+ coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.0)
+ railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs