diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-31 00:56:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-31 00:56:38 +0000 |
| commit | 605eae85badccd2c63afa0cf093986c827b35382 (patch) | |
| tree | c7e2eff6f886cce52a98e647bf8291493612f384 /Gemfile.lock | |
| parent | 84764847f7ea65af2553e0647bcde6a2e8b62840 (diff) | |
| parent | f784393213b3402467465dca5c81643ae700c55d (diff) | |
| download | gitlab-ce-605eae85badccd2c63afa0cf093986c827b35382.tar.gz | |
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index da27c62acbf..bd41cc84198 100644 --- 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 |