diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-04 10:18:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-04 10:18:23 +0000 |
| commit | 55e12ccd8ac32078073f4efad102164535049319 (patch) | |
| tree | 246e16100d0316b97d9f454a51002a5479be8fd3 /Gemfile.lock | |
| parent | f8696018cc81419474cf738a0cd9c5523c3a4a30 (diff) | |
| parent | d1873f16b4cc954b1417fa84517d44b22a05821f (diff) | |
| download | gitlab-ce-55e12ccd8ac32078073f4efad102164535049319.tar.gz | |
Merge branch 'rs-bump-cal-heatmap' into 'master'
Bump cal-heatmap-rails to ~> 3.5.0
See merge request !2276
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9769ae80a7d..7b70c05bc48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (8.2.1) - cal-heatmap-rails (0.0.1) + cal-heatmap-rails (3.5.1) capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -849,7 +849,7 @@ DEPENDENCIES bullet bundler-audit byebug - cal-heatmap-rails (~> 0.0.1) + cal-heatmap-rails (~> 3.5.0) capybara (~> 2.4.0) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.9.0) @@ -859,7 +859,7 @@ DEPENDENCIES connection_pool (~> 2.0) coveralls (~> 0.8.2) creole (~> 0.5.0) - d3_rails (~> 3.5.5) + d3_rails (~> 3.5.0) database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) devise (~> 3.5.3) |