diff --git a/Gemfile b/Gemfile index 913236c..09c4b64 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' ruby '2.1.2' -gem 'rails', '4.1.1' +gem 'rails', '4.1.2' gem 'sqlite3' gem 'sass-rails', '~> 4.0.3' gem 'uglifier', '>= 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index dafef89..2b72fa4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) + actionmailer (4.1.2) + actionpack (= 4.1.2) + actionview (= 4.1.2) mail (~> 2.5.4) - actionpack (4.1.1) - actionview (= 4.1.1) - activesupport (= 4.1.1) + actionpack (4.1.2) + actionview (= 4.1.2) + activesupport (= 4.1.2) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.1) - activesupport (= 4.1.1) + actionview (4.1.2) + activesupport (= 4.1.2) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.1) - activesupport (= 4.1.1) + activemodel (4.1.2) + activesupport (= 4.1.2) builder (~> 3.1) - activerecord (4.1.1) - activemodel (= 4.1.1) - activesupport (= 4.1.1) + activerecord (4.1.2) + activemodel (= 4.1.2) + activesupport (= 4.1.2) arel (~> 5.0.0) - activesupport (4.1.1) + activesupport (4.1.2) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -34,7 +34,7 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.1.1.1) + bootstrap-sass (3.2.0.0) sass (~> 3.2) builder (3.2.2) capybara (2.3.0) @@ -57,7 +57,7 @@ GEM debug_inspector (0.0.2) diff-lcs (1.2.5) erubis (2.7.0) - execjs (2.2.0) + execjs (2.2.1) factory_girl (4.4.0) activesupport (>= 3.0.0) factory_girl_rails (4.4.1) @@ -67,13 +67,13 @@ GEM i18n (~> 0.5) ffi (1.9.3) hashie (2.1.2) - high_voltage (2.1.0) + high_voltage (2.2.0) hike (1.2.3) i18n (0.6.9) jbuilder (2.1.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (3.1.0) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -104,20 +104,20 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.1) - actionmailer (= 4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - activemodel (= 4.1.1) - activerecord (= 4.1.1) - activesupport (= 4.1.1) + rails (4.1.2) + actionmailer (= 4.1.2) + actionpack (= 4.1.2) + actionview (= 4.1.2) + activemodel (= 4.1.2) + activerecord (= 4.1.2) + activesupport (= 4.1.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.1) + railties (= 4.1.2) sprockets-rails (~> 2.0) rails_layout (1.0.20) - railties (4.1.1) - actionpack (= 4.1.1) - activesupport (= 4.1.1) + railties (4.1.2) + actionpack (= 4.1.2) + activesupport (= 4.1.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -138,7 +138,7 @@ GEM rspec-expectations (~> 3.0.0) rspec-mocks (~> 3.0.0) rspec-support (~> 3.0.0) - rspec-support (3.0.1) + rspec-support (3.0.2) rubyzip (1.1.4) sass (3.2.19) sass-rails (4.0.3) @@ -201,7 +201,7 @@ DEPENDENCIES omniauth omniauth-twitter quiet_assets - rails (= 4.1.1) + rails (= 4.1.2) rails_layout rspec-rails sass-rails (~> 4.0.3) diff --git a/config/environments/production.rb b/config/environments/production.rb index 47d3553..a8836c3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -32,8 +32,7 @@ # Generate digests for assets URLs. config.assets.digest = true - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' + # `config.assets.precompile` has moved to config/initializers/assets.rb # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000..d2f4ec3 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/config/routes.rb b/config/routes.rb index f2c192a..04129e4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do root :to => "visitors#index" - resources :users, :only => [:index, :show, :edit, :update ] + resources :users, :only => [:index, :show] get '/auth/:provider/callback' => 'sessions#create' get '/signin' => 'sessions#new', :as => :signin get '/signout' => 'sessions#destroy', :as => :signout