feat: Upgrade font-awesome-rails and rake

calacademy-research · Jan 4, 2018 · 63e8f36 · 63e8f36
1 parent 1cfbe39
commit 63e8f36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem 'mysql2'
 gem 'quiet_assets'
 gem 'rack'
 gem 'rack-cors', require: 'rack/cors'
-gem 'rake', '< 11.0'
+gem 'rake'
 gem 'request_store'
 gem 'sass-rails'
 gem 'sprockets-rails', require: 'sprockets/railtie'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -161,8 +161,8 @@ GEM
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
-    font-awesome-rails (4.5.0.0)
-      railties (>= 3.2, < 5.0)
+    font-awesome-rails (4.7.0.2)
+      railties (>= 3.2, < 5.2)
     formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
@@ -297,7 +297,7 @@ GEM
       activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (12.3.0)
     ransack (1.8.4)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -447,7 +447,7 @@ DEPENDENCIES
   rack-cors
   rails (~> 4.2)
   rails-observers
-  rake (< 11.0)
+  rake
   redcarpet
   request_store
   rouge
@@ -477,4 +477,4 @@ RUBY VERSION
    ruby 2.3.3p222
 
 BUNDLED WITH
-   1.15.4
+   1.16.0