Commit 605eae85 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'upgrade-coffee-rails' into 'master'

Upgrade coffee-rails 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).

Working towards #14286.

See merge request !3398
parents 84764847 f7843932
......@@ -126,9 +126,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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment