agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Bundle update

Browse Source
This commit is contained in:
echarp 2015-02-01 11:29:54 +01:00
parent 741bee5fbc
commit 080fe1fe3d
2 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -67,8 +67,6 @@ gem 'differ'
# A generic library to administrate the tool # A generic library to administrate the tool
gem 'activeadmin', github: 'activeadmin' gem 'activeadmin', github: 'activeadmin'
gem 'inherited_resources', github: 'josevalim/inherited_resources',
branch: 'rails-4-2'
# A nicer markdown editor in active admin # A nicer markdown editor in active admin
gem 'activeadmin_pagedown' gem 'activeadmin_pagedown'

54
Gemfile.lock
View File

@ -1,6 +1,6 @@
GIT GIT
remote: git://github.com/activeadmin/activeadmin.git remote: git://github.com/activeadmin/activeadmin.git
revision: 9fac1106ca013c4cd76ee6b231ec5dd1fcfd0790 revision: b3a9f4b3e4051447d011c59649a73f876989a199
specs: specs:
activeadmin (1.0.0.pre) activeadmin (1.0.0.pre)
arbre (~> 1.0, >= 1.0.2) arbre (~> 1.0, >= 1.0.2)
@ -8,7 +8,7 @@ GIT
coffee-rails coffee-rails
formtastic (~> 3.1) formtastic (~> 3.1)
formtastic_i18n formtastic_i18n
inherited_resources (~> 1.4, != 1.5.0) inherited_resources (~> 1.6)
jquery-rails jquery-rails
jquery-ui-rails (~> 5.0) jquery-ui-rails (~> 5.0)
kaminari (~> 0.15) kaminari (~> 0.15)
@ -24,17 +24,6 @@ GIT
jquery-rails jquery-rails
rails (>= 3.2.2) rails (>= 3.2.2)
GIT
remote: git://github.com/josevalim/inherited_resources.git
revision: ff1c991307ff78cce98882b6986aeabbbcfd70c4
branch: rails-4-2
specs:
inherited_resources (1.5.1)
actionpack (>= 3.2, < 5)
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
responders
GIT GIT
remote: git://github.com/svenfuchs/i18n-active_record.git remote: git://github.com/svenfuchs/i18n-active_record.git
revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc
@ -91,11 +80,11 @@ GEM
ast (2.0.0) ast (2.0.0)
astrolabe (1.3.0) astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0) parser (>= 2.2.0.pre.3, < 3.0)
bcrypt (3.1.9) bcrypt (3.1.10)
bourbon (4.1.1) bourbon (4.1.1)
sass (~> 3.3) sass (~> 3.3)
thor thor
brakeman (3.0.0) brakeman (3.0.1)
erubis (~> 2.6) erubis (~> 2.6)
fastercsv (~> 1.5) fastercsv (~> 1.5)
haml (>= 3.0, < 5.0) haml (>= 3.0, < 5.0)
@ -104,7 +93,6 @@ GEM
ruby2ruby (~> 2.1.1) ruby2ruby (~> 2.1.1)
ruby_parser (~> 3.5.0) ruby_parser (~> 3.5.0)
sass (~> 3.0) sass (~> 3.0)
slim (>= 1.3.6, < 3.0)
terminal-table (~> 1.4) terminal-table (~> 1.4)
buftok (0.2.0) buftok (0.2.0)
builder (3.2.2) builder (3.2.2)
@ -118,7 +106,7 @@ GEM
coffee-script (2.3.0) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.8.0) coffee-script-source (1.9.0)
compass (1.0.3) compass (1.0.3)
chunky_png (~> 1.2) chunky_png (~> 1.2)
compass-core (~> 1.0.2) compass-core (~> 1.0.2)
@ -158,13 +146,13 @@ GEM
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.9.6) ffi (1.9.6)
font-awesome-rails (4.2.0.0) font-awesome-rails (4.3.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
formatador (0.2.5) formatador (0.2.5)
formtastic (3.1.3) formtastic (3.1.3)
actionpack (>= 3.2.13) actionpack (>= 3.2.13)
formtastic_i18n (0.1.1) formtastic_i18n (0.1.1)
geocoder (1.2.6) geocoder (1.2.7)
globalid (0.3.0) globalid (0.3.0)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
guard (2.11.1) guard (2.11.1)
@ -204,7 +192,7 @@ GEM
haml (~> 4.0) haml (~> 4.0)
rubocop (>= 0.25.0) rubocop (>= 0.25.0)
sysexits (~> 1.1) sysexits (~> 1.1)
haml-rails (0.7.0) haml-rails (0.8.2)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
activesupport (>= 4.0.1) activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0) haml (>= 3.1, < 5.0)
@ -223,9 +211,14 @@ GEM
ruby_parser (~> 3.5) ruby_parser (~> 3.5)
http (0.6.3) http (0.6.3)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
http_accept_language (2.0.2) http_accept_language (2.0.5)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.7.0) i18n (0.7.0)
inherited_resources (1.6.0)
actionpack (>= 3.2, < 5)
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
responders
jbuilder (2.2.6) jbuilder (2.2.6)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
@ -269,7 +262,7 @@ GEM
mysql2 (0.3.17) mysql2 (0.3.17)
naught (1.0.0) naught (1.0.0)
nenv (0.2.0) nenv (0.2.0)
nokogiri (1.6.5) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
notiffany (0.0.3) notiffany (0.0.3)
nenv (~> 0.1) nenv (~> 0.1)
@ -318,7 +311,7 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
rake (10.4.2) rake (10.4.2)
ransack (1.6.2) ransack (1.6.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
@ -331,8 +324,8 @@ GEM
json (~> 1.4) json (~> 1.4)
redcarpet (3.2.2) redcarpet (3.2.2)
ref (1.0.5) ref (1.0.5)
responders (2.0.2) responders (2.1.0)
railties (>= 4.2.0.alpha, < 5) railties (>= 4.2.0, < 5)
rubocop (0.28.0) rubocop (0.28.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0) parser (>= 2.2.0.pre.7, < 3.0)
@ -345,7 +338,7 @@ GEM
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
ruby_parser (3.5.0) ruby_parser (3.5.0)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.4.10) sass (3.4.11)
sass-rails (5.0.1) sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.1) sass (~> 3.1)
@ -367,9 +360,6 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
simplecov-html (0.8.0) simplecov-html (0.8.0)
slim (2.1.0)
temple (~> 0.6.9)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0) slop (3.6.0)
spring (1.2.0) spring (1.2.0)
sprockets (2.12.3) sprockets (2.12.3)
@ -377,15 +367,14 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.2) sprockets-rails (2.2.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10) sqlite3 (1.3.10)
strip_attributes (1.5.1) strip_attributes (1.6.0)
activemodel (>= 3.0, < 5.0) activemodel (>= 3.0, < 5.0)
sysexits (1.2.0) sysexits (1.2.0)
temple (0.6.10)
terminal-table (1.4.5) terminal-table (1.4.5)
therubyracer (0.12.1) therubyracer (0.12.1)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
@ -450,7 +439,6 @@ DEPENDENCIES
has_scope has_scope
http_accept_language http_accept_language
i18n-active_record! i18n-active_record!
inherited_resources!
jbuilder jbuilder
jquery-rails jquery-rails
jquery-sparkline-rails! jquery-sparkline-rails!