gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #820 from differentreality/update_rolify

Browse source 
update rolify
This commit is contained in:
Henne Vogelsang 2016-03-09 11:32:52 +01:00
commit 0df693ffbf
6 changed files with 351 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -85,7 +85,7 @@ GEM
byebug (3.1.2)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
cancancan (1.8.4)
cancancan (1.13.1)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@ -336,8 +336,8 @@ GEM
rails-assets-bootstrap-markdown (2.10.0)
rails-assets-bootstrap (~> 3)
rails-assets-date.format (1.2.3)
rails-assets-holderjs (2.9.1)
rails-assets-jquery (2.2.0)
rails-assets-holderjs (2.9.3)
rails-assets-jquery (2.2.1)
rails-assets-jquery-smooth-scroll (1.7.2)
rails-assets-jquery (>= 1.4.2)
rails-assets-leaflet (0.7.7)
@ -384,7 +384,7 @@ GEM
rest-client (1.7.3)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rolify (3.4.0)
rolify (5.0.0)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)