diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-27 13:59:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-27 13:59:01 +0000 |
| commit | 940d68cc4c349b574166b010666a36cf25f485b7 (patch) | |
| tree | 97f654a06257c3646753cc3fd16144d66c4ed440 /Gemfile.lock | |
| parent | d974803ccc3572eadde72fffca7244cd1b26a6c9 (diff) | |
| parent | 63c74bb0eee81b96ce675d5875f2bbad04362353 (diff) | |
| download | gitlab-ce-940d68cc4c349b574166b010666a36cf25f485b7.tar.gz | |
Merge branch 'rs-update-jquery-atwho-rails' into 'master'
Bump jquery-atwho-rails to ~> 1.3.2
Closes #2858
See merge request !1687
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 53122898b07..340eb0fc301 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -354,7 +354,7 @@ GEM ice_nine (0.11.1) inflecto (0.0.2) ipaddress (0.8.0) - jquery-atwho-rails (1.0.1) + jquery-atwho-rails (1.3.2) jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -840,7 +840,7 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) - jquery-atwho-rails (~> 1.0.0) + jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 3.1.3) jquery-scrollto-rails (~> 1.4.3) jquery-turbolinks (~> 2.0.1) |