mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-01-17 06:52:27 +01:00
Merge branch 'dev' of github.com:sleede/fab-manager into dev
This commit is contained in:
commit
ce3e89c49c
2
Gemfile
2
Gemfile
@ -4,7 +4,7 @@ gem 'compass-rails', '2.0.4'
|
||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||
gem 'rails', '4.2.11.1'
|
||||
# Use Puma as web server
|
||||
gem 'puma', '3.12.2'
|
||||
gem 'puma', '3.12.3'
|
||||
# Use SCSS for stylesheets
|
||||
gem 'sass-rails', '5.0.1'
|
||||
|
||||
|
@ -273,7 +273,7 @@ GEM
|
||||
protected_attributes (1.1.3)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
public_suffix (3.0.2)
|
||||
puma (3.12.2)
|
||||
puma (3.12.3)
|
||||
pundit (1.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
raabro (1.1.6)
|
||||
@ -489,7 +489,7 @@ DEPENDENCIES
|
||||
prawn
|
||||
prawn-table
|
||||
protected_attributes
|
||||
puma (= 3.12.2)
|
||||
puma (= 3.12.3)
|
||||
pundit
|
||||
rack-protection (= 1.5.5)
|
||||
railroady
|
||||
|
Loading…
x
Reference in New Issue
Block a user