Bundle update

This commit is contained in:
echarp 2015-02-28 17:57:21 +01:00
parent 5157db228c
commit 7f19aa05c0
2 changed files with 17 additions and 18 deletions

View File

@ -93,8 +93,6 @@ gem 'meta-tags'
gem 'twitter'
gem 'sqlite3'
group :development do
# Spring speeds up development by keeping your application running in the
# background. Read more: https://github.com/rails/spring
@ -103,6 +101,7 @@ group :development do
# gem 'better_errors'
# gem 'binding_of_caller'
gem 'sqlite3'
gem 'guard-livereload'
gem 'guard-migrate'
gem 'guard-bundler'

View File

@ -1,6 +1,6 @@
GIT
remote: git://github.com/activeadmin/activeadmin.git
revision: ed1fbca8c64af827616c58f274d7be256ca513b6
revision: 7fe4ccb44da425a40438bee9516ed8d2ae87cd13
specs:
activeadmin (1.0.0.pre)
arbre (~> 1.0, >= 1.0.2)
@ -81,7 +81,7 @@ GEM
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
bcrypt (3.1.10)
bourbon (4.2.0)
bourbon (4.2.1)
sass (~> 3.4)
thor
brakeman (3.0.1)
@ -98,7 +98,7 @@ GEM
builder (3.2.2)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.3)
chunky_png (1.3.4)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
@ -106,7 +106,7 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.9.0)
coffee-script-source (1.9.1)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
@ -155,7 +155,7 @@ GEM
geocoder (1.2.7)
globalid (0.3.3)
activesupport (>= 4.1.0)
guard (2.12.1)
guard (2.12.4)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
@ -180,7 +180,7 @@ GEM
activerecord (>= 4.1.0)
guard (~> 2.3)
guard-compat (~> 1.1)
guard-minitest (2.4.3)
guard-minitest (2.4.4)
guard-compat (~> 1.2)
minitest (>= 3.0)
guard-rubocop (1.2.0)
@ -219,7 +219,7 @@ GEM
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
responders
jbuilder (2.2.7)
jbuilder (2.2.8)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.3)
@ -259,12 +259,12 @@ GEM
modernizr-rails (2.7.1)
multi_json (1.10.1)
multipart-post (2.0.0)
mysql2 (0.3.17)
mysql2 (0.3.18)
naught (1.0.0)
nenv (0.2.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
notiffany (0.0.5)
notiffany (0.0.6)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
@ -301,7 +301,7 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
rails-i18n (4.0.3)
rails-i18n (4.0.4)
i18n (~> 0.6)
railties (~> 4.0)
railties (4.2.0)
@ -338,7 +338,7 @@ GEM
sexp_processor (~> 4.0)
ruby_parser (3.5.0)
sexp_processor (~> 4.1)
sass (3.4.12)
sass (3.4.13)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
@ -355,13 +355,13 @@ GEM
simple_calendar (1.1.10)
rails (>= 3.0)
simple_oauth (0.3.1)
simplecov (0.9.1)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
slop (3.6.0)
spring (1.3.2)
spring (1.3.3)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
@ -403,7 +403,7 @@ GEM
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.0)
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)