diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-16 20:28:02 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-16 20:28:02 -0400 |
| commit | 68e77a36236752131803369e6d9132a6a70c0405 (patch) | |
| tree | 8b6ed177afdbd05b048658bc40d163ccd40f3fc5 | |
| parent | dce64418544b27033cb1c1d1169087393ad019f7 (diff) | |
| download | gitlab-ce-rs-rails-update.tar.gz | |
Bump jquery-rails gem versionrs-rails-update
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -193,7 +193,7 @@ gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.1' gem 'gon', '~> 5.0.0' gem 'jquery-atwho-rails', '~> 1.0.0' -gem 'jquery-rails', '3.1.2' +gem 'jquery-rails', '3.1.3' gem 'jquery-scrollto-rails' gem 'jquery-ui-rails' gem 'nprogress-rails' diff --git a/Gemfile.lock b/Gemfile.lock index a910519107b..9d294485151 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -331,7 +331,7 @@ GEM inflecto (0.0.2) ipaddress (0.8.0) jquery-atwho-rails (1.0.1) - jquery-rails (3.1.2) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-scrollto-rails (1.4.3) @@ -777,7 +777,7 @@ DEPENDENCIES html-pipeline (~> 1.11.0) httparty jquery-atwho-rails (~> 1.0.0) - jquery-rails (= 3.1.2) + jquery-rails (= 3.1.3) jquery-scrollto-rails jquery-turbolinks jquery-ui-rails |