Skip to content

Commit

Permalink
build using rails_apps_composer 2.4.40
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielKehoe
DanielKehoe committed Apr 4, 2014
1 parent e2945fc commit ebaa79d
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 35 deletions.
3 changes: 0 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ db/*.sqlite3
/log/*
/tmp/*

# configuration file introduced in Rails 4.1
/config/secrets.yml

# various artifacts
**.war
*.rbc
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem 'devise'
gem 'pundit'
group :development do
gem 'better_errors'
gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :rbx]
gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :mri_21, :rbx]
gem 'quiet_assets'
gem 'rails_layout'
end
33 changes: 16 additions & 17 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 1.1)
arel (5.0.0)
atomic (1.1.15)
atomic (1.1.16)
bcrypt (3.1.7)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
Expand All @@ -47,8 +45,8 @@ GEM
execjs
coffee-script-source (1.7.0)
debug_inspector (0.0.2)
devise (3.2.3)
bcrypt-ruby (~> 3.0)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
Expand All @@ -57,7 +55,7 @@ GEM
execjs (2.0.2)
hike (1.2.3)
i18n (0.6.9)
jbuilder (2.0.3)
jbuilder (2.0.5)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.1.0)
Expand All @@ -68,8 +66,8 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
minitest (5.3.0)
multi_json (1.8.4)
minitest (5.3.2)
multi_json (1.9.2)
orm_adapter (0.5.0)
polyglot (0.3.4)
pundit (0.2.2)
Expand All @@ -89,20 +87,21 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.0.rc1)
sprockets-rails (~> 2.0.0)
rails_layout (1.0.8)
rails_layout (1.0.13)
railties (4.1.0.rc1)
actionpack (= 4.1.0.rc1)
activesupport (= 4.1.0.rc1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.1)
rake (10.2.2)
rdoc (4.1.1)
json (~> 1.4)
sass (3.2.14)
sass-rails (4.0.1)
sass (3.2.18)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
Expand All @@ -117,8 +116,8 @@ GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
thor (0.18.1)
thread_safe (0.2.0)
thor (0.19.1)
thread_safe (0.3.1)
atomic (>= 1.1.7, < 2)
tilt (1.4.1)
treetop (1.4.15)
Expand All @@ -128,7 +127,7 @@ GEM
coffee-rails
tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.4.0)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
Expand Down
8 changes: 5 additions & 3 deletions app/assets/stylesheets/application.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require_self
*= require_tree .
*= require_self
*/
4 changes: 2 additions & 2 deletions app/views/layouts/application.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><%= content_for?(:title) ? yield(:title) : "Rails Devise Pundit" %></title>
<meta name="description" content="<%= content_for?(:description) ? yield(:description) : "Rails Devise Pundit" %>">
<%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions config/environments/development.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.delivery_method = :smtp
config.action_mailer.raise_delivery_errors = true
# Send email in development mode.
config.action_mailer.perform_deliveries = false
# Send email in development mode?
config.action_mailer.perform_deliveries = true


# Adds additional error checking when serving assets at runtime.
Expand Down
16 changes: 9 additions & 7 deletions config/initializers/devise.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
# particular strategies by setting this option.
# Notice that if you are skipping storage for all authentication paths, you
# may want to disable generating routes to Devise's sessions controller by
# passing :skip => :sessions to `devise_for` in your config/routes.rb
# passing skip: :sessions to `devise_for` in your config/routes.rb
config.skip_session_storage = [:http_auth]

# By default, Devise cleans up the CSRF token on authentication to
Expand All @@ -91,7 +91,9 @@
#
# Limiting the stretches to just one in testing will increase the performance of
# your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
# a value less than 10 in other environments.
# a value less than 10 in other environments. Note that, for bcrypt (the default
# encryptor), the cost increases exponentially with the number of stretches (e.g.
# a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
config.stretches = Rails.env.test? ? 1 : 10

# Setup a pepper to generate the encrypted password.
Expand All @@ -115,8 +117,8 @@

# If true, requires any email changes to be confirmed (exactly the same way as
# initial account confirmation) to be applied. Requires additional unconfirmed_email
# db field (see migrations). Until confirmed new email is stored in
# unconfirmed email column, and copied to email column on successful confirmation.
# db field (see migrations). Until confirmed, new email is stored in
# unconfirmed_email column, and copied to email column on successful confirmation.
config.reconfirmable = true

# Defines which key will be used when confirming an account
Expand All @@ -130,7 +132,7 @@
# config.extend_remember_period = false

# Options to be passed to the created cookie. For instance, you can set
# :secure => true in order to force SSL only cookies.
# secure: true in order to force SSL only cookies.
# config.rememberable_options = {}

# ==> Configuration for :validatable
Expand Down Expand Up @@ -227,15 +229,15 @@
# ==> OmniAuth
# Add a new OmniAuth provider. Check the wiki for more information on setting
# up on your models and hooks.
# config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
# config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'

# ==> Warden configuration
# If you want to use other strategies, that are not supported by Devise, or
# change the failure app, you can configure them inside the config.warden block.
#
# config.warden do |manager|
# manager.intercept_401 = false
# manager.default_strategies(:scope => :user).unshift :some_external_strategy
# manager.default_strategies(scope: :user).unshift :some_external_strategy
# end

# ==> Mountable engine configurations
Expand Down

0 comments on commit ebaa79d

Please sign in to comment.