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

Merge branch 'upgrade-coffee-rails' into 'master'
605eae85 · Robert Speicher · 84764847 · f7843932 · 605eae85
Commit 605eae85 authored Mar 31, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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