Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

build using rails_apps_composer 2.2.10

  • Loading branch information...
commit 6e9e202ad16629f5ab4be42f67dcc40259d0871d 1 parent c9d5c35
@DanielKehoe DanielKehoe authored
View
4 Gemfile
@@ -13,8 +13,8 @@ gem "email_spec", ">= 1.2.1", :group => :test
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
gem "database_cleaner", ">= 0.8.0", :group => :test
gem "launchy", ">= 2.1.2", :group => :test
-gem "factory_girl_rails", ">= 4.0.0", :group => [:development, :test]
-gem "bootstrap-sass", ">= 2.0.4.0"
+gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
+gem "bootstrap-sass", ">= 2.1.0.0"
gem "devise", ">= 2.1.2"
gem "cancan", ">= 1.6.8"
gem "rolify", ">= 3.2.0"
View
28 Gemfile.lock
@@ -31,8 +31,8 @@ GEM
addressable (2.3.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.0.4.0)
- builder (3.0.0)
+ bootstrap-sass (2.1.0.0)
+ builder (3.0.3)
cancan (1.6.8)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -72,18 +72,18 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (4.0.0)
+ factory_girl (4.1.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.0.0)
- factory_girl (~> 4.0.0)
+ factory_girl_rails (4.1.0)
+ factory_girl (~> 4.1.0)
railties (>= 3.0.0)
ffi (1.1.5)
gherkin (2.11.2)
json (>= 1.4.6)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.1.1)
+ jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
@@ -105,7 +105,7 @@ GEM
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
@@ -131,9 +131,9 @@ GEM
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
- rspec-expectations (2.11.2)
+ rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.2)
+ rspec-mocks (2.11.3)
rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -161,9 +161,9 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
- uglifier (1.2.7)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
+ multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
rack (>= 1.0)
xpath (0.1.4)
@@ -173,7 +173,7 @@ PLATFORMS
ruby
DEPENDENCIES
- bootstrap-sass (>= 2.0.4.0)
+ bootstrap-sass (>= 2.1.0.0)
cancan (>= 1.6.8)
capybara (>= 1.1.2)
coffee-rails (~> 3.2.1)
@@ -181,7 +181,7 @@ DEPENDENCIES
database_cleaner (>= 0.8.0)
devise (>= 2.1.2)
email_spec (>= 1.2.1)
- factory_girl_rails (>= 4.0.0)
+ factory_girl_rails (>= 4.1.0)
jquery-rails
launchy (>= 2.1.2)
rails (= 3.2.8)
View
2  app/controllers/application_controller.rb
@@ -1,6 +1,8 @@
class ApplicationController < ActionController::Base
protect_from_forgery
+
rescue_from CanCan::AccessDenied do |exception|
redirect_to root_path, :alert => exception.message
end
+
end
View
10 app/views/layouts/application.html.erb
@@ -1,12 +1,10 @@
-<!doctype html>
+<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><%= content_for?(:title) ? yield(:title) : "Rails3 Bootstrap Devise Cancan" %></title>
- <meta name="description" content=""/>
- <meta name="author" content=""/>
- <%= stylesheet_link_tag "application", :media => "all" %>
+ <meta name="description" content="<%= content_for?(:description) ? yield(:description) : "Rails3 Bootstrap Devise Cancan" %>">
+ <%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
<%= yield(:head) %>
Please sign in to comment.
Something went wrong with that request. Please try again.