diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-25 18:06:24 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-25 18:06:24 +0200 |
| commit | 4037a738945631c5fc58c464d4a9b12e9448387a (patch) | |
| tree | 427307dcc0a5ba74e36b10dba8e78e910550ab7d /Gemfile | |
| parent | e5a59331cf5221d39f9430480d449f30bbe8e63f (diff) | |
| parent | 22ff009a54b281f8db2fd28530b84ebf53bf9de6 (diff) | |
| download | gitlab-ce-4037a738945631c5fc58c464d4a9b12e9448387a.tar.gz | |
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -178,7 +178,7 @@ gem 'ruby-fogbugz', '~> 0.2.1' gem 'd3_rails', '~> 3.5.0' #cal-heatmap -gem 'cal-heatmap-rails', '~> 3.5.0' +gem 'cal-heatmap-rails', '~> 3.6.0' # underscore-rails gem "underscore-rails", "~> 1.8.0" |