Bundle update
This commit is contained in:
parent
5319fdec77
commit
59aa9e7265
2
Gemfile
2
Gemfile
@ -45,7 +45,7 @@ gem 'modernizr-rails'
|
||||
gem 'webshims-rails'
|
||||
|
||||
# Improve the html select element
|
||||
gem 'select2-rails'
|
||||
gem 'select2-rails', '< 4'
|
||||
|
||||
gem 'devise'
|
||||
gem 'devise-i18n'
|
||||
|
33
Gemfile.lock
33
Gemfile.lock
@ -37,7 +37,7 @@ GEM
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview-encoded_mail_to (1.0.7)
|
||||
rails
|
||||
activeadmin (1.0.0.pre1)
|
||||
activeadmin (1.0.0.pre2)
|
||||
arbre (~> 1.0, >= 1.0.2)
|
||||
bourbon
|
||||
coffee-rails
|
||||
@ -45,7 +45,7 @@ GEM
|
||||
formtastic_i18n
|
||||
inherited_resources (~> 1.6)
|
||||
jquery-rails
|
||||
jquery-ui-rails (~> 5.0)
|
||||
jquery-ui-rails
|
||||
kaminari (~> 0.15)
|
||||
rails (>= 3.2, < 5.0)
|
||||
ransack (~> 1.3)
|
||||
@ -78,10 +78,10 @@ GEM
|
||||
bcrypt (3.1.10)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bourbon (4.2.4)
|
||||
bourbon (4.2.5)
|
||||
sass (~> 3.4)
|
||||
thor (~> 0.19)
|
||||
brakeman (3.1.0)
|
||||
brakeman (3.1.1)
|
||||
erubis (~> 2.6)
|
||||
fastercsv (~> 1.5)
|
||||
haml (>= 3.0, < 5.0)
|
||||
@ -91,7 +91,7 @@ GEM
|
||||
ruby_parser (~> 3.7.0)
|
||||
sass (~> 3.0)
|
||||
slim (>= 1.3.6, < 4.0)
|
||||
terminal-table (~> 1.4.5)
|
||||
terminal-table (~> 1.4)
|
||||
buftok (0.2.0)
|
||||
builder (3.2.2)
|
||||
byebug (6.0.2)
|
||||
@ -201,14 +201,14 @@ GEM
|
||||
has_scope (0.6.0)
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
highline (1.7.3)
|
||||
highline (1.7.7)
|
||||
hike (1.2.3)
|
||||
html2haml (2.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
haml (~> 4.0.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
ruby_parser (~> 3.5)
|
||||
http (0.9.6)
|
||||
http (0.9.8)
|
||||
addressable (~> 2.3)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 1.0.1)
|
||||
@ -224,7 +224,7 @@ GEM
|
||||
has_scope (~> 0.6.0.rc)
|
||||
railties (>= 3.2, < 5)
|
||||
responders
|
||||
jbuilder (2.3.1)
|
||||
jbuilder (2.3.2)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-rails (4.0.5)
|
||||
@ -259,7 +259,7 @@ GEM
|
||||
method_source (0.8.2)
|
||||
mime-types (2.6.2)
|
||||
mini_portile (0.6.2)
|
||||
minitest (5.8.0)
|
||||
minitest (5.8.1)
|
||||
modernizr-rails (2.7.1)
|
||||
multi_json (1.11.2)
|
||||
multipart-post (2.0.0)
|
||||
@ -268,7 +268,7 @@ GEM
|
||||
nenv (0.2.0)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
notiffany (0.0.7)
|
||||
notiffany (0.0.8)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
orm_adapter (0.5.0)
|
||||
@ -281,7 +281,7 @@ GEM
|
||||
polyamorous (1.2.0)
|
||||
activerecord (>= 3.0)
|
||||
powerpack (0.1.1)
|
||||
pry (0.10.1)
|
||||
pry (0.10.2)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
@ -329,13 +329,12 @@ GEM
|
||||
rb-inotify (0.9.5)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (4.2.0)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.3.2)
|
||||
redcarpet (3.3.3)
|
||||
ref (2.0.0)
|
||||
request_store (1.2.0)
|
||||
responders (2.1.0)
|
||||
railties (>= 4.2.0, < 5)
|
||||
rubocop (0.34.1)
|
||||
rubocop (0.34.2)
|
||||
astrolabe (~> 1.3)
|
||||
parser (>= 2.2.2.5, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
@ -361,7 +360,7 @@ GEM
|
||||
thor (~> 0.14)
|
||||
sexp_processor (4.6.0)
|
||||
shellany (0.0.1)
|
||||
simple_calendar (2.0.0)
|
||||
simple_calendar (2.0.2)
|
||||
rails (>= 3.0)
|
||||
simple_oauth (0.3.1)
|
||||
simplecov (0.10.0)
|
||||
@ -388,7 +387,7 @@ GEM
|
||||
activemodel (>= 3.0, < 5.0)
|
||||
sysexits (1.2.0)
|
||||
temple (0.7.6)
|
||||
terminal-table (1.4.5)
|
||||
terminal-table (1.5.2)
|
||||
therubyracer (0.12.2)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
@ -475,7 +474,7 @@ DEPENDENCIES
|
||||
redcarpet
|
||||
sass-rails
|
||||
sdoc (~> 0.4.0)
|
||||
select2-rails
|
||||
select2-rails (< 4)
|
||||
simple_calendar
|
||||
simplecov
|
||||
spring
|
||||
|
Loading…
Reference in New Issue
Block a user