Rails 4 update.
This commit is contained in:
Señor Rolando
parent
0317602854
commit
3a50f77a7c
4 changed files with 132 additions and 173 deletions
35
Gemfile
35
Gemfile
|
|
@ -1,33 +1,27 @@
|
||||||
# -*- mode: yaml; -*-
|
# -*- mode: yaml; -*-
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.2.12'
|
gem 'rails', '4.0.1'
|
||||||
|
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
|
|
||||||
gem 'bootstrap-sass', '2.0.2'
|
gem 'bootstrap-sass', '~> 3.0.0.0'
|
||||||
|
|
||||||
# Bourbon: fancy css mixins – https://github.com/thoughtbot/bourbon
|
# Bourbon: fancy css mixins – https://github.com/thoughtbot/bourbon
|
||||||
gem 'bourbon', '1.4.0'
|
gem 'bourbon'
|
||||||
|
|
||||||
gem 'activeadmin', '0.4.0'
|
|
||||||
|
|
||||||
# https://github.com/plataformatec/devise
|
# https://github.com/plataformatec/devise
|
||||||
gem 'devise', '2.0.4'
|
gem 'devise'
|
||||||
gem 'bcrypt-ruby', '3.0.1'
|
gem 'bcrypt-ruby'
|
||||||
|
|
||||||
# https://github.com/ryanb/cancan
|
# https://github.com/ryanb/cancan
|
||||||
gem 'cancan', '1.6.5'
|
gem 'cancan'
|
||||||
|
|
||||||
# Deploy with Capistrano
|
# Deploy with Capistrano
|
||||||
gem 'capistrano', '2.5.21'
|
gem 'capistrano'
|
||||||
|
|
||||||
# For avatar images: https://github.com/jnicklas/carrierwave
|
# For avatar images: https://github.com/jnicklas/carrierwave
|
||||||
# gem 'rmagick', '2.9.2'
|
gem 'carrierwave'
|
||||||
gem 'carrierwave', '0.6.2'
|
|
||||||
|
|
||||||
# Specify this directly in order to use version we also have @production site. Otherwise, 'rdoc' pulls newest version in.
|
|
||||||
gem 'json', '1.6.5'
|
|
||||||
|
|
||||||
# We are sending mail. The latest version is just fine.
|
# We are sending mail. The latest version is just fine.
|
||||||
gem 'mail'
|
gem 'mail'
|
||||||
|
|
@ -42,15 +36,12 @@ gem 'mail'
|
||||||
# gem 'sqlite3-ruby', :require => 'sqlite3'
|
# gem 'sqlite3-ruby', :require => 'sqlite3'
|
||||||
# gem 'aws-s3', :require => 'aws/s3'
|
# gem 'aws-s3', :require => 'aws/s3'
|
||||||
|
|
||||||
# Gems used only for assets and not required
|
# These used to be in an ":assets" group. Which has been removed by Rails 4.
|
||||||
# in production environments by default.
|
gem 'sass-rails'
|
||||||
group :assets do
|
gem 'coffee-rails'
|
||||||
gem 'sass-rails', '3.2.5'
|
gem 'uglifier'
|
||||||
gem 'coffee-rails', '3.2.2'
|
|
||||||
gem 'uglifier'
|
|
||||||
end
|
|
||||||
|
|
||||||
# gem 'jquery-rails'
|
gem 'jquery-rails'
|
||||||
|
|
||||||
# Bundle gems for the local environment. Make sure to
|
# Bundle gems for the local environment. Make sure to
|
||||||
# put test-only gems in this group so their generators
|
# put test-only gems in this group so their generators
|
||||||
|
|
|
||||||
259
Gemfile.lock
259
Gemfile.lock
|
|
@ -1,181 +1,148 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.12)
|
actionmailer (4.0.1)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 4.0.1)
|
||||||
mail (~> 2.4.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (3.2.12)
|
actionpack (4.0.1)
|
||||||
activemodel (= 3.2.12)
|
activesupport (= 4.0.1)
|
||||||
activesupport (= 3.2.12)
|
builder (~> 3.1.0)
|
||||||
builder (~> 3.0.0)
|
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
rack (~> 1.5.2)
|
||||||
rack (~> 1.4.5)
|
rack-test (~> 0.6.2)
|
||||||
rack-cache (~> 1.2)
|
activemodel (4.0.1)
|
||||||
rack-test (~> 0.6.1)
|
activesupport (= 4.0.1)
|
||||||
sprockets (~> 2.2.1)
|
builder (~> 3.1.0)
|
||||||
activeadmin (0.4.0)
|
activerecord (4.0.1)
|
||||||
bourbon (>= 1.0.0)
|
activemodel (= 4.0.1)
|
||||||
devise (>= 1.1.2)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
fastercsv
|
activesupport (= 4.0.1)
|
||||||
formtastic (>= 2.0.0)
|
arel (~> 4.0.0)
|
||||||
inherited_resources (< 1.3.0)
|
activerecord-deprecated_finders (1.0.3)
|
||||||
jquery-rails (>= 1.0.0)
|
activesupport (4.0.1)
|
||||||
kaminari (>= 0.13.0)
|
i18n (~> 0.6, >= 0.6.4)
|
||||||
meta_search (>= 0.9.2)
|
minitest (~> 4.2)
|
||||||
rails (>= 3.0.0)
|
multi_json (~> 1.3)
|
||||||
sass (>= 3.1.0)
|
thread_safe (~> 0.1)
|
||||||
activemodel (3.2.12)
|
tzinfo (~> 0.3.37)
|
||||||
activesupport (= 3.2.12)
|
arel (4.0.1)
|
||||||
builder (~> 3.0.0)
|
atomic (1.1.14)
|
||||||
activerecord (3.2.12)
|
bcrypt-ruby (3.1.2)
|
||||||
activemodel (= 3.2.12)
|
bootstrap-sass (3.0.0.0)
|
||||||
activesupport (= 3.2.12)
|
sass (~> 3.2)
|
||||||
arel (~> 3.0.2)
|
bourbon (3.1.8)
|
||||||
tzinfo (~> 0.3.29)
|
sass (>= 3.2.0)
|
||||||
activeresource (3.2.12)
|
thor
|
||||||
activemodel (= 3.2.12)
|
builder (3.1.4)
|
||||||
activesupport (= 3.2.12)
|
cancan (1.6.10)
|
||||||
activesupport (3.2.12)
|
capistrano (3.0.1)
|
||||||
i18n (~> 0.6)
|
i18n
|
||||||
multi_json (~> 1.0)
|
rake (>= 10.0.0)
|
||||||
arel (3.0.2)
|
sshkit (>= 0.0.23)
|
||||||
bcrypt-ruby (3.0.1)
|
carrierwave (0.9.0)
|
||||||
bootstrap-sass (2.0.2)
|
|
||||||
bourbon (1.4.0)
|
|
||||||
sass (>= 3.1)
|
|
||||||
builder (3.0.4)
|
|
||||||
cancan (1.6.5)
|
|
||||||
capistrano (2.5.21)
|
|
||||||
highline
|
|
||||||
net-scp (>= 1.0.0)
|
|
||||||
net-sftp (>= 2.0.0)
|
|
||||||
net-ssh (>= 2.0.14)
|
|
||||||
net-ssh-gateway (>= 1.0.0)
|
|
||||||
carrierwave (0.6.2)
|
|
||||||
activemodel (>= 3.2.0)
|
activemodel (>= 3.2.0)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 3.2.0)
|
||||||
coffee-rails (3.2.2)
|
json (>= 1.7)
|
||||||
|
coffee-rails (4.0.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (~> 3.2.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
coffee-script (2.2.0)
|
coffee-script (2.2.0)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.3.3)
|
coffee-script-source (1.6.3)
|
||||||
devise (2.0.4)
|
devise (3.1.1)
|
||||||
bcrypt-ruby (~> 3.0)
|
bcrypt-ruby (~> 3.0)
|
||||||
orm_adapter (~> 0.0.3)
|
orm_adapter (~> 0.1)
|
||||||
railties (~> 3.1)
|
railties (>= 3.2.6, < 5)
|
||||||
warden (~> 1.1.1)
|
thread_safe (~> 0.1)
|
||||||
|
warden (~> 1.2.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (1.4.0)
|
execjs (2.0.2)
|
||||||
multi_json (~> 1.0)
|
hike (1.2.3)
|
||||||
fastercsv (1.5.5)
|
i18n (0.6.5)
|
||||||
formtastic (2.2.1)
|
jquery-rails (3.0.4)
|
||||||
actionpack (>= 3.0)
|
railties (>= 3.0, < 5.0)
|
||||||
has_scope (0.5.1)
|
thor (>= 0.14, < 2.0)
|
||||||
highline (1.6.12)
|
json (1.8.1)
|
||||||
hike (1.2.1)
|
mail (2.5.4)
|
||||||
i18n (0.6.1)
|
|
||||||
inherited_resources (1.2.2)
|
|
||||||
has_scope (~> 0.5.0)
|
|
||||||
responders (~> 0.6.0)
|
|
||||||
journey (1.0.4)
|
|
||||||
jquery-rails (2.0.2)
|
|
||||||
railties (>= 3.2.0, < 5.0)
|
|
||||||
thor (~> 0.14)
|
|
||||||
json (1.6.5)
|
|
||||||
kaminari (0.13.0)
|
|
||||||
actionpack (>= 3.0.0)
|
|
||||||
activesupport (>= 3.0.0)
|
|
||||||
railties (>= 3.0.0)
|
|
||||||
mail (2.4.4)
|
|
||||||
i18n (>= 0.4.0)
|
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
meta_search (1.1.3)
|
mime-types (1.25)
|
||||||
actionpack (~> 3.1)
|
minitest (4.7.5)
|
||||||
activerecord (~> 3.1)
|
multi_json (1.8.2)
|
||||||
activesupport (~> 3.1)
|
net-scp (1.1.2)
|
||||||
polyamorous (~> 0.5.0)
|
net-ssh (>= 2.6.5)
|
||||||
mime-types (1.21)
|
net-ssh (2.7.0)
|
||||||
multi_json (1.6.0)
|
orm_adapter (0.4.0)
|
||||||
net-scp (1.0.4)
|
pg (0.17.0)
|
||||||
net-ssh (>= 1.99.1)
|
|
||||||
net-sftp (2.0.5)
|
|
||||||
net-ssh (>= 2.0.9)
|
|
||||||
net-ssh (2.5.2)
|
|
||||||
net-ssh-gateway (1.1.0)
|
|
||||||
net-ssh (>= 1.99.1)
|
|
||||||
orm_adapter (0.0.7)
|
|
||||||
pg (0.14.0)
|
|
||||||
polyamorous (0.5.0)
|
|
||||||
activerecord (~> 3.0)
|
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.3)
|
||||||
rack (1.4.5)
|
rack (1.5.2)
|
||||||
rack-cache (1.2)
|
|
||||||
rack (>= 0.4)
|
|
||||||
rack-ssl (1.3.3)
|
|
||||||
rack
|
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.12)
|
rails (4.0.1)
|
||||||
actionmailer (= 3.2.12)
|
actionmailer (= 4.0.1)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 4.0.1)
|
||||||
activerecord (= 3.2.12)
|
activerecord (= 4.0.1)
|
||||||
activeresource (= 3.2.12)
|
activesupport (= 4.0.1)
|
||||||
activesupport (= 3.2.12)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
bundler (~> 1.0)
|
railties (= 4.0.1)
|
||||||
railties (= 3.2.12)
|
sprockets-rails (~> 2.0.0)
|
||||||
railties (3.2.12)
|
railties (4.0.1)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 4.0.1)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 4.0.1)
|
||||||
rack-ssl (~> 1.3.2)
|
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
thor (>= 0.18.1, < 2.0)
|
||||||
thor (>= 0.14.6, < 2.0)
|
rake (10.1.0)
|
||||||
rake (10.0.3)
|
sass (3.2.12)
|
||||||
rdoc (3.12.1)
|
sass-rails (4.0.1)
|
||||||
json (~> 1.4)
|
railties (>= 4.0.0, < 5.0)
|
||||||
responders (0.6.5)
|
|
||||||
sass (3.1.19)
|
|
||||||
sass-rails (3.2.5)
|
|
||||||
railties (~> 3.2.0)
|
|
||||||
sass (>= 3.1.10)
|
sass (>= 3.1.10)
|
||||||
tilt (~> 1.3)
|
sprockets-rails (~> 2.0.0)
|
||||||
sprockets (2.2.2)
|
sprockets (2.10.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
thor (0.17.0)
|
sprockets-rails (2.0.1)
|
||||||
tilt (1.3.3)
|
actionpack (>= 3.0)
|
||||||
treetop (1.4.12)
|
activesupport (>= 3.0)
|
||||||
|
sprockets (~> 2.8)
|
||||||
|
sshkit (1.1.0)
|
||||||
|
net-scp
|
||||||
|
net-ssh
|
||||||
|
term-ansicolor
|
||||||
|
term-ansicolor (1.2.2)
|
||||||
|
tins (~> 0.8)
|
||||||
|
thor (0.18.1)
|
||||||
|
thread_safe (0.1.3)
|
||||||
|
atomic
|
||||||
|
tilt (1.4.1)
|
||||||
|
tins (0.12.0)
|
||||||
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.35)
|
tzinfo (0.3.38)
|
||||||
uglifier (1.2.4)
|
uglifier (2.3.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (>= 1.0.2)
|
json (>= 1.8.0)
|
||||||
warden (1.1.1)
|
warden (1.2.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
activeadmin (= 0.4.0)
|
bcrypt-ruby
|
||||||
bcrypt-ruby (= 3.0.1)
|
bootstrap-sass (~> 3.0.0.0)
|
||||||
bootstrap-sass (= 2.0.2)
|
bourbon
|
||||||
bourbon (= 1.4.0)
|
cancan
|
||||||
cancan (= 1.6.5)
|
capistrano
|
||||||
capistrano (= 2.5.21)
|
carrierwave
|
||||||
carrierwave (= 0.6.2)
|
coffee-rails
|
||||||
coffee-rails (= 3.2.2)
|
devise
|
||||||
devise (= 2.0.4)
|
jquery-rails
|
||||||
json (= 1.6.5)
|
|
||||||
mail
|
mail
|
||||||
pg
|
pg
|
||||||
rails (= 3.2.12)
|
rails (= 4.0.1)
|
||||||
sass-rails (= 3.2.5)
|
sass-rails
|
||||||
uglifier
|
uglifier
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,8 @@ class User < ActiveRecord::Base
|
||||||
:recoverable, :rememberable, :trackable, :validatable
|
:recoverable, :rememberable, :trackable, :validatable
|
||||||
|
|
||||||
# Setup accessible (or protected) attributes for your model
|
# Setup accessible (or protected) attributes for your model
|
||||||
attr_accessible :email, :password, :password_confirmation, :remember_me
|
# Note: This is not needed anymore as devise now complies with the strong parameters rules of Rails 4 (which are handled in the ApplicationController).
|
||||||
|
# attr_accessible :email, :password, :password_confirmation, :remember_me
|
||||||
|
|
||||||
# This is needed by CanCan
|
# This is needed by CanCan
|
||||||
def admin?
|
def admin?
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ ContactORama::Application.routes.draw do
|
||||||
end
|
end
|
||||||
resources :contacts
|
resources :contacts
|
||||||
|
|
||||||
match 'uielements/' => 'uielements#index'
|
get 'uielements/', to: 'uielements#index'
|
||||||
|
|
||||||
# The priority is based upon order of creation:
|
# The priority is based upon order of creation:
|
||||||
# first created -> highest priority.
|
# first created -> highest priority.
|
||||||
|
|
@ -60,9 +60,9 @@ ContactORama::Application.routes.draw do
|
||||||
|
|
||||||
# Use CanCan to (optionally) lead logged in users to someplace special.
|
# Use CanCan to (optionally) lead logged in users to someplace special.
|
||||||
# http://railsapps.github.com/tutorial-rails-bootstrap-devise-cancan.html
|
# http://railsapps.github.com/tutorial-rails-bootstrap-devise-cancan.html
|
||||||
authenticated :user do
|
# authenticated :user do
|
||||||
root :to => 'welcome#index'
|
# root :to => 'welcome#index'
|
||||||
end
|
# end
|
||||||
root :to => "welcome#index"
|
root :to => "welcome#index"
|
||||||
|
|
||||||
# See how all your routes lay out with "rake routes"
|
# See how all your routes lay out with "rake routes"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue