Merge branch 'master' of github.com:OpenMandrivaSoftware/rosa-build

2018-10-30 11:03:47 +03:00 · 2018-10-30 11:03:47 +03:00 · bec87c8077
parent 14cb3eb2dd 92e20eb0c4
commit bec87c8077
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -6,7 +6,7 @@ gem 'activeadmin',                      github: 'activeadmin'
 gem 'pg'
 gem 'schema_plus'
 ########
-gem 'devise'
+gem 'devise', git: 'https://github.com/plataformatec/devise' #, ref: '88e9a85'
 gem 'omniauth-github'
 gem 'pundit'
 gem 'rbtrace'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -158,7 +158,7 @@ GEM
    gli (2.16.0)
    globalid (0.4.0)
      activesupport (>= 4.2.0)
-    haml (5.0.1)
+    haml (5.0.4)
      temple (>= 0.8.0)
      tilt
    haml-rails (1.0.0)