Skip to content

Commit

Permalink
bundle update
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfrederickson
mfrederickson committed Apr 2, 2015
1 parent c4ba8f0 commit 339c1d4
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 103 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ gem 'bootstrap-datepicker-rails'
gem 'twitter-bootstrap-rails-confirm'

#RMagick is used for image resizing and processing
gem 'rmagick', :require => 'RMagick', :platforms => :ruby
gem 'rmagick', :require => 'rmagick', :platforms => :ruby

# Attachable does all the file work.
gem 'attachable'

gem 'devise', '~> 3.0.0'
gem 'devise', '~> 3'
gem 'cancancan'

gem 'json'
Expand Down
213 changes: 112 additions & 101 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
actionmailer (4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.7)
actionview (= 4.1.7)
activesupport (= 4.1.7)
actionpack (4.1.10)
actionview (= 4.1.10)
activesupport (= 4.1.10)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.7)
activesupport (= 4.1.7)
actionview (4.1.10)
activesupport (= 4.1.10)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.7)
activesupport (= 4.1.7)
activemodel (4.1.10)
activesupport (= 4.1.10)
builder (~> 3.1)
activerecord (4.1.7)
activemodel (= 4.1.7)
activesupport (= 4.1.7)
activerecord (4.1.10)
activemodel (= 4.1.10)
activesupport (= 4.1.10)
arel (~> 5.0.0)
activesupport (4.1.7)
activesupport (4.1.10)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
addressable (2.3.8)
airbrake (4.1.0)
builder
multi_json
Expand All @@ -37,26 +37,24 @@ GEM
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
bcrypt (3.1.7)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bootstrap-datepicker-rails (1.3.0.2)
bcrypt (3.1.10)
bootstrap-datepicker-rails (1.4.0)
railties (>= 3.0)
builder (3.2.2)
bundler-audit (0.3.1)
bundler (~> 1.2)
thor (~> 0.18)
cancancan (1.9.2)
clockwork (1.0.0)
cancancan (1.10.1)
clockwork (1.1.0)
activesupport
tzinfo
coffee-rails (4.0.1)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
coffee-script-source (1.9.1)
concerto_calendar (0.0.7)
google-api-client
icalendar
Expand All @@ -74,164 +72,178 @@ GEM
concerto_weather (0.0.8)
rails
connection_pool (1.2.0)
delayed_job (4.0.4)
activesupport (>= 3.0, < 4.2)
delayed_job_active_record (4.0.2)
activerecord (>= 3.0, < 4.2)
delayed_job (4.0.6)
activesupport (>= 3.0, < 5.0)
delayed_job_active_record (4.0.3)
activerecord (>= 3.0, < 5.0)
delayed_job (>= 3.0, < 4.1)
devise (3.0.4)
bcrypt-ruby (~> 3.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
docile (1.1.5)
dotenv (0.11.1)
dotenv-deployment (~> 0.0.2)
dotenv-deployment (0.0.2)
easy_translate (0.5.0)
json
thread
thread_safe
erubis (2.7.0)
execjs (2.2.2)
extlib (0.9.16)
faraday (0.9.0)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
foreman (0.75.0)
dotenv (~> 0.11.1)
foreman (0.78.0)
thor (~> 0.19.1)
girl_friday (0.11.2)
connection_pool (~> 1.0)
rubinius-actor
google-analytics-turbolinks (0.0.4)
google-api-client (0.7.1)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
extlib (>= 0.9.15)
faraday (>= 0.9.0)
jwt (>= 0.1.5)
launchy (>= 2.1.1)
multi_json (>= 1.0.0)
retriable (>= 1.4)
signet (>= 0.5.0)
uuidtools (>= 2.1.0)
highline (1.6.21)
google-api-client (0.8.5)
activesupport (>= 3.2)
addressable (~> 2.3)
autoparse (~> 0.3)
extlib (~> 0.9)
faraday (~> 0.9)
googleauth (~> 0.3)
launchy (~> 2.4)
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
googleauth (0.4.0)
faraday (~> 0.9)
jwt (~> 1.4)
logging (~> 1.8)
memoist (~> 0.11)
multi_json (= 1.11)
signet (~> 0.6)
highline (1.7.1)
hike (1.2.3)
i18n (0.6.11)
i18n-js (3.0.0.rc8)
i18n (0.7.0)
i18n-js (3.0.0.rc9)
i18n (~> 0.6)
i18n-tasks (0.7.10)
i18n-tasks (0.7.13)
activesupport
easy_translate (>= 0.5.0)
erubis
highline
i18n
slop (>= 3.5.0)
slop (~> 3.5)
term-ansicolor
terminal-table
icalendar (2.2.0)
icalendar (2.2.2)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-timepicker-rails (1.4.3)
railties (>= 3.1.0)
json (1.8.1)
jwt (1.0.0)
kaminari (0.16.1)
json (1.8.2)
jwt (1.4.1)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
launchy (2.4.2)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.7)
mail (2.6.1)
little-plugger (1.1.3)
logging (1.8.2)
little-plugger (>= 1.1.3)
multi_json (>= 1.8.4)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoist (0.11.0)
mime-types (2.4.3)
minitest (5.4.2)
multi_json (1.10.1)
minitest (5.5.1)
multi_json (1.11.0)
multipart-post (2.0.0)
mysql2 (0.3.16)
nprogress-rails (0.1.6.3)
mysql2 (0.3.18)
nprogress-rails (0.1.6.6)
orm_adapter (0.5.0)
pg (0.18.1)
public_activity (1.4.2)
actionpack (>= 3.0.0)
activerecord (>= 3.0)
i18n (>= 0.5.0)
railties (>= 3.0.0)
rack (1.5.2)
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.7)
actionmailer (= 4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
activemodel (= 4.1.7)
activerecord (= 4.1.7)
activesupport (= 4.1.7)
rails (4.1.10)
actionmailer (= 4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
activemodel (= 4.1.10)
activerecord (= 4.1.10)
activesupport (= 4.1.10)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.7)
railties (= 4.1.10)
sprockets-rails (~> 2.0)
railties (4.1.7)
actionpack (= 4.1.7)
activesupport (= 4.1.7)
railties (4.1.10)
actionpack (= 4.1.10)
activesupport (= 4.1.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
redcarpet (3.2.0)
rake (10.4.2)
redcarpet (3.2.2)
ref (1.0.5)
responders (1.1.2)
railties (>= 3.2, < 4.2)
retriable (1.4.1)
rmagick (2.13.3)
rmagick (2.14.0)
rubinius-actor (0.0.2)
rubinius-core-api
rubinius-core-api (0.0.1)
ruby-xslt (0.9.9)
rubyzip (1.1.6)
sass (3.2.19)
sass-rails (4.0.4)
rubyzip (1.1.7)
sass (3.4.13)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12)
sprockets-rails (~> 2.0)
signet (0.5.1)
addressable (>= 2.2.3)
faraday (>= 0.9.0.rc5)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
simplecov (0.9.1)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
signet (0.6.0)
addressable (~> 2.3)
extlib (~> 0.9)
faraday (~> 0.9)
jwt (~> 1.0)
multi_json (~> 1.10)
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)
sprockets (2.11.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.0)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9)
sqlite3 (1.3.10)
term-ansicolor (1.3.0)
tins (~> 1.0)
terminal-table (1.4.5)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread (0.1.4)
thread_safe (0.3.4)
thread (0.1.5)
thread_safe (0.3.5)
tilt (1.4.1)
tins (1.3.3)
turbolinks (2.4.0)
tins (1.3.5)
turbolinks (2.5.3)
coffee-rails
twitter-bootstrap-rails-confirm (1.0.3)
twitter-bootstrap-rails-confirm (1.0.4)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.5)
warden (1.2.3)
rack (>= 1.0)

Expand All @@ -253,7 +265,7 @@ DEPENDENCIES
concerto_simple_rss
concerto_weather
delayed_job_active_record
devise (~> 3.0.0)
devise (~> 3)
execjs (~> 2.2.2)
foreman
girl_friday
Expand Down Expand Up @@ -281,4 +293,3 @@ DEPENDENCIES
turbolinks
twitter-bootstrap-rails-confirm
uglifier

0 comments on commit 339c1d4

Please sign in to comment.