diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-07 01:01:17 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-07 01:01:17 +0100 |
| commit | fe57b80587855eb85e9a4ae94e88dff1efe6dc39 (patch) | |
| tree | 4338271b562ae99ebfb688657df60686639db79b | |
| parent | d12c992191c0b3941b4cabb36f059b798dd20a35 (diff) | |
| download | gitlab-ce-fe57b80587855eb85e9a4ae94e88dff1efe6dc39.tar.gz | |
Relax font-awesome-rails dependency to ~> 4.7
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -231,7 +231,7 @@ gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' -gem 'font-awesome-rails', '~> 4.6.1' +gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.0' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' diff --git a/Gemfile.lock b/Gemfile.lock index f59bde27bc4..3a88b4cbeaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -878,7 +878,7 @@ DEPENDENCIES fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) + font-awesome-rails (~> 4.7) foreman (~> 0.78.0) fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) |