Skip to content

Commit

Permalink
Update more Gems
Browse files Browse the repository at this point in the history
  • Loading branch information
@bryanbibat
bryanbibat committed Oct 20, 2014
1 parent b9ab5e3 commit 860e629
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 63 deletions.
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source 'https://rubygems.org'

gem 'rails', '4.1.5'
gem 'rails', '4.1.6'

gem 'pg'
gem 'puma', '2.9.0'
gem 'puma', '2.9.1'

gem 'sass-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '>= 2.0.1'

gem 'asset_sync'
Expand All @@ -29,12 +29,12 @@ gem 'redcarpet'
gem 'gmaps4rails'

gem 'sitemap_generator'
gem 'icalendar', '~> 2.1.0'
gem 'icalendar', '~> 2.2.0'

gem 'textacular', '~> 3.2.0'

group :development, :test do
gem 'rspec-rails', '~> 3.0.1'
gem 'rspec-rails', '~> 3.1.0'
gem 'haml-rails', '~> 0.4'
gem 'mina'
gem 'pry'
Expand Down
111 changes: 53 additions & 58 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
mail (~> 2.5.4)
actionpack (4.1.5)
actionview (= 4.1.5)
activesupport (= 4.1.5)
actionmailer (4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.6)
actionview (= 4.1.6)
activesupport (= 4.1.6)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.5)
activesupport (= 4.1.5)
actionview (4.1.6)
activesupport (= 4.1.6)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.5)
activesupport (= 4.1.5)
activemodel (4.1.6)
activesupport (= 4.1.6)
builder (~> 3.1)
activerecord (4.1.5)
activemodel (= 4.1.5)
activesupport (= 4.1.5)
activerecord (4.1.6)
activemodel (= 4.1.6)
activesupport (= 4.1.6)
arel (~> 5.0.0)
activesupport (4.1.5)
activesupport (4.1.6)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand Down Expand Up @@ -56,7 +56,7 @@ GEM
childprocess (0.5.5)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.0)
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)
Expand Down Expand Up @@ -157,7 +157,7 @@ GEM
hike (1.2.3)
hitimes (1.2.2)
i18n (0.6.11)
icalendar (2.1.2)
icalendar (2.2.0)
inflecto (0.0.2)
ipaddress (0.8.0)
jquery-rails (3.1.2)
Expand All @@ -178,17 +178,16 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.9)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.6.1)
mime-types (>= 1.16, < 3)
meta-tags (2.0.0)
actionpack (>= 3.0.0)
meta_request (0.3.4)
callsite (~> 0.0, >= 0.0.11)
rack-contrib (~> 1.1)
railties (>= 3.0.0, < 5.0.0)
method_source (0.8.2)
mime-types (1.25.1)
mime-types (2.4.2)
mina (0.3.1)
open4 (~> 1.3.4)
rake
Expand All @@ -204,12 +203,11 @@ GEM
open4 (1.3.4)
orm_adapter (0.5.0)
pg (0.17.1)
polyglot (0.3.5)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
puma (2.9.0)
puma (2.9.1)
rack (>= 1.1, < 2.0)
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
Expand All @@ -221,15 +219,15 @@ GEM
rack (~> 1.1)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.5)
actionmailer (= 4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
activemodel (= 4.1.5)
activerecord (= 4.1.5)
activesupport (= 4.1.5)
rails (4.1.6)
actionmailer (= 4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
activemodel (= 4.1.6)
activerecord (= 4.1.6)
activesupport (= 4.1.6)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.5)
railties (= 4.1.6)
sprockets-rails (~> 2.0)
rails_admin (0.6.5)
builder (~> 3.1)
Expand All @@ -245,9 +243,9 @@ GEM
remotipart (~> 1.0)
safe_yaml (~> 1.0)
sass-rails (~> 4.0)
railties (4.1.5)
actionpack (= 4.1.5)
activesupport (= 4.1.5)
railties (4.1.6)
actionpack (= 4.1.6)
activesupport (= 4.1.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
Expand All @@ -258,26 +256,26 @@ GEM
remotipart (1.2.1)
responders (1.1.1)
railties (>= 3.2, < 4.2)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.4)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.4)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.4)
rspec-support (~> 3.0.0)
rspec-rails (3.0.2)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.4)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.3)
Expand Down Expand Up @@ -320,9 +318,6 @@ GEM
tilt (1.4.1)
timers (4.0.1)
hitimes
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
Expand All @@ -347,7 +342,7 @@ DEPENDENCIES
bootstrap-sass (~> 3.2.0.0)
cancan (>= 1.6.8)
capybara (~> 2.4.1)
coffee-rails (~> 4.0.0)
coffee-rails (~> 4.1.0)
database_cleaner (>= 0.8.0)
devise (>= 2.1.2)
email_spec (>= 1.2.1)
Expand All @@ -362,7 +357,7 @@ DEPENDENCIES
guard-spork
haml
haml-rails (~> 0.4)
icalendar (~> 2.1.0)
icalendar (~> 2.2.0)
jquery-rails (>= 2.1.1)
kaminari (>= 0.13.0)
launchy
Expand All @@ -372,14 +367,14 @@ DEPENDENCIES
mina
pg
pry
puma (= 2.9.0)
puma (= 2.9.1)
quiet_assets
rails (= 4.1.5)
rails (= 4.1.6)
rails_admin
rb-fsevent
rb-inotify
redcarpet
rspec-rails (~> 3.0.1)
rspec-rails (~> 3.1.0)
sass-rails (~> 4.0.0)
shoulda (>= 3.1.1)
shoulda-matchers
Expand Down

0 comments on commit 860e629

Please sign in to comment.