Skip to content

Commit

Permalink
update gems
Browse files Browse the repository at this point in the history
  • Loading branch information
@jhass
jhass committed Aug 18, 2014
1 parent da4e1dc commit 738cfff
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 63 deletions.
8 changes: 4 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ gem 'unicorn'

gem 'mysql2'

gem 'devise', '~> 3.2.4'
gem 'devise', '~> 3.3.0'
gem 'rails_admin'

gem 'rails_locale_detection', '~> 2.0.0.pre'

gem 'sass-rails', '~> 4.0.0'
gem 'bootstrap-sass', '~> 3.1.1.1'
gem 'bootstrap-sass', '~> 3.2.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails'
Expand All @@ -23,8 +23,8 @@ gem 'paperclip', '~> 4.1'

group :development, :test do
gem 'rspec-rails', '~> 3.0.1'
gem 'capybara', '~> 2.3.0'
gem 'capybara', '~> 2.4.1'

gem 'fuubar', '~> 1.3.3'
gem 'fuubar', '~> 2.0.0'
gem 'rspec-instafail', '~> 0.2.4'
end
107 changes: 54 additions & 53 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
actionmailer (4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
mail (~> 2.5.4)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
actionpack (4.1.5)
actionview (= 4.1.5)
activesupport (= 4.1.5)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.4)
activesupport (= 4.1.4)
actionview (4.1.5)
activesupport (= 4.1.5)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.4)
activesupport (= 4.1.4)
activemodel (4.1.5)
activesupport (= 4.1.5)
builder (~> 3.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
activerecord (4.1.5)
activemodel (= 4.1.5)
activesupport (= 4.1.5)
arel (~> 5.0.0)
activesupport (4.1.4)
activesupport (4.1.5)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
arel (5.0.1.20140414130214)
bcrypt (3.1.7)
bootstrap-sass (3.1.1.1)
bootstrap-sass (3.2.0.1)
sass (~> 3.2)
builder (3.2.2)
capybara (2.3.0)
capybara (2.4.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
Expand All @@ -45,36 +45,36 @@ GEM
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
devise (3.2.4)
coffee-script-source (1.7.1)
devise (3.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.1.0)
execjs (2.2.1)
font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0)
fuubar (1.3.3)
rspec (>= 2.14.0, < 3.1.0)
fuubar (2.0.0)
rspec (~> 3.0)
ruby-progressbar (~> 1.4)
haml (4.0.5)
tilt
hike (1.2.3)
http_accept_language (1.0.2)
i18n (0.6.9)
jquery-rails (3.1.0)
i18n (0.6.11)
jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
railties (>= 3.2.16)
json (1.8.1)
kaminari (0.15.1)
kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.2)
Expand All @@ -83,34 +83,34 @@ GEM
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.6.0)
minitest (5.3.5)
minitest (5.4.0)
multi_json (1.10.1)
mysql2 (0.3.16)
nested_form (0.3.2)
nokogiri (1.6.2.1)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
orm_adapter (0.5.0)
paperclip (4.1.1)
paperclip (4.2.0)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
mime-types
polyglot (0.3.5)
rack (1.5.2)
rack-pjax (0.7.0)
rack-pjax (0.8.0)
nokogiri (~> 1.5)
rack (~> 1.3)
rack (~> 1.1)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
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)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4)
railties (= 4.1.5)
sprockets-rails (~> 2.0)
rails_admin (0.6.2)
builder (~> 3.1)
Expand All @@ -129,9 +129,9 @@ GEM
rails_locale_detection (2.0.0.pre4)
http_accept_language (~> 1.0.2)
rails (>= 3.2.0)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
railties (4.1.5)
actionpack (= 4.1.5)
activesupport (= 4.1.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
Expand All @@ -142,23 +142,24 @@ GEM
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.0)
rspec-core (3.0.4)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.0)
rspec-expectations (3.0.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-instafail (0.2.4)
rspec-mocks (3.0.0)
rspec-instafail (0.2.5)
rspec
rspec-mocks (3.0.4)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
rspec-rails (3.0.2)
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.0)
rspec-support (3.0.4)
ruby-progressbar (1.5.1)
safe_yaml (1.0.3)
sass (3.2.19)
Expand All @@ -184,9 +185,9 @@ GEM
polyglot (>= 0.3.1)
turbolinks (2.2.2)
coffee-rails
tzinfo (1.2.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.0)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
Expand All @@ -202,11 +203,11 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (~> 3.1.1.1)
capybara (~> 2.3.0)
bootstrap-sass (~> 3.2.0)
capybara (~> 2.4.1)
coffee-rails (~> 4.0.0)
devise (~> 3.2.4)
fuubar (~> 1.3.3)
devise (~> 3.3.0)
fuubar (~> 2.0.0)
jquery-rails
mysql2
paperclip (~> 4.1)
Expand Down
12 changes: 6 additions & 6 deletions db/schema.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
t.string "title", null: false
t.boolean "published", default: false
t.text "content", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "rails_admin_histories", force: true do |t|
Expand All @@ -41,8 +41,8 @@
t.string "table"
t.integer "month", limit: 2
t.integer "year", limit: 8
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

add_index "rails_admin_histories", ["item", "table", "month", "year"], name: "index_rails_admin_histories", using: :btree
Expand All @@ -58,8 +58,8 @@
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
Expand Down

0 comments on commit 738cfff

Please sign in to comment.