Bundle update
This commit is contained in:
parent
e815c78c33
commit
4d96c3ab81
@ -1,6 +1,6 @@
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: a8ae008ec9632110bf33443ce7090dfef9cca480
|
||||
revision: 7a2a31067e99e8e484942a3cddc44be1980b1ae6
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0)
|
||||
@ -272,7 +272,7 @@ GEM
|
||||
thread_safe (0.3.4)
|
||||
tilt (1.4.1)
|
||||
timers (1.1.0)
|
||||
tinymce-rails (4.1.2)
|
||||
tinymce-rails (4.1.3)
|
||||
railties (>= 3.1.1)
|
||||
tinymce-rails-langs (4.20140129)
|
||||
tinymce-rails (~> 4.0)
|
||||
@ -289,7 +289,7 @@ GEM
|
||||
warden (1.2.3)
|
||||
rack (>= 1.0)
|
||||
webrick (1.3.1)
|
||||
webshims-rails (1.14.5)
|
||||
webshims-rails (1.14.6)
|
||||
rails (> 3.1.0)
|
||||
|
||||
PLATFORMS
|
||||
|
@ -1,4 +1,4 @@
|
||||
development:
|
||||
developmen:
|
||||
adapter: sqlite3
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
@ -13,7 +13,8 @@ test:
|
||||
timeout: 5000
|
||||
database: db/test.sqlite3
|
||||
|
||||
production:
|
||||
#production:
|
||||
development:
|
||||
adapter: mysql2
|
||||
encoding: utf8
|
||||
database: adl_fr
|
||||
|
Loading…
Reference in New Issue
Block a user