Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Wedge 2018-10-30 11:03:47 +03:00
parent 14cb3eb2dd 92e20eb0c4
commit bec87c8077
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -6,7 +6,7 @@ gem 'activeadmin', github: 'activeadmin'
gem 'pg' gem 'pg'
gem 'schema_plus' gem 'schema_plus'
######## ########
gem 'devise' gem 'devise', git: 'https://github.com/plataformatec/devise' #, ref: '88e9a85'
gem 'omniauth-github' gem 'omniauth-github'
gem 'pundit' gem 'pundit'
gem 'rbtrace' gem 'rbtrace'

2
Gemfile.lock
View File

@ -158,7 +158,7 @@ GEM
gli (2.16.0) gli (2.16.0)
globalid (0.4.0) globalid (0.4.0)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
haml (5.0.1) haml (5.0.4)
temple (>= 0.8.0) temple (>= 0.8.0)
tilt tilt
haml-rails (1.0.0) haml-rails (1.0.0)