diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-05-29 00:05:14 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-05-29 00:05:14 -0400 |
| commit | cef8ab460402b46002c0a25e90418f6920bb3c18 (patch) | |
| tree | cff3b4e827d13451313bd0ef10aeda164c701a1f | |
| parent | 51888f746c8afe43c5fed90c8013a03788821099 (diff) | |
| download | gitlab-ce-cef8ab460402b46002c0a25e90418f6920bb3c18.tar.gz | |
Bump turbolinks version
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 7 insertions, 7 deletions
@@ -186,7 +186,7 @@ gem 'charlock_holmes' gem "sass-rails", '~> 4.0.2' gem "coffee-rails" gem "uglifier" -gem 'turbolinks' +gem 'turbolinks', '~> 2.5.0' gem 'jquery-turbolinks' gem 'select2-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 7dbc3b4ffa9..f479ca7ed53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,13 +101,13 @@ GEM coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.9.1.1) colored (1.2) colorize (0.5.8) columnize (0.9.0) @@ -418,7 +418,7 @@ GEM quiet_assets (1.0.2) railties (>= 3.1, < 5.0) racc (1.4.10) - rack (1.5.2) + rack (1.5.3) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.3.0) @@ -633,7 +633,7 @@ GEM multi_json (~> 1.7) twitter-stream (~> 0.1) tins (0.13.1) - turbolinks (2.0.0) + turbolinks (2.5.3) coffee-rails twitter-stream (0.1.16) eventmachine (>= 0.12.8) @@ -806,7 +806,7 @@ DEPENDENCIES test_after_commit thin tinder (~> 1.9.2) - turbolinks + turbolinks (~> 2.5.0) uglifier underscore-rails (~> 1.4.4) unf |