Permalink
Browse files

update for newer gems

  • Loading branch information...
1 parent ab6a4f3 commit 3ca4fe2eed07087387e98110dfbc1f250b6e657c @fortuity fortuity committed Apr 19, 2011
View
@@ -1,5 +1,11 @@
#----------------------------------------------------------------------------
# Ignore these files when commiting to a git repository
+#
+# The original version of this file is found here:
+# https://github.com/fortuity/rails3-gitignore/raw/master/gitignore.txt
+#
+# Corrections? Improvements? Create a GitHub issue:
+# https://github.com/fortuity/rails3-gitignore/issues
#----------------------------------------------------------------------------
# bundler state
@@ -27,12 +33,10 @@ tmp/*
/doc/app/
/doc/features.html
/doc/specs.html
-/log/*
/public/cache
/public/stylesheets/compiled
/public/system
/spec/tmp/*
-/tmp/*
/cache
/capybara*
/capybara-*.html
@@ -46,14 +50,14 @@ tmp/*
# scm revert files
**.orig
-# mac finder poop
+# Mac finder artifacts
.DS_Store
-# netbeans project directory
+# Netbeans project directory
/nbproject/
-# textmate project files
+# Textmate project files
/*.tmpproj
-# vim poop
+# vim artifacts
**.swp
View
22 Gemfile
@@ -1,12 +1,12 @@
source 'http://rubygems.org'
-gem 'rails', '>= 3.0.5'
-gem 'mongoid', '>= 2.0.0.rc.8'
-gem "bson_ext", ">= 1.2.4"
-gem "rspec-rails", ">= 2.5", :group => [:development, :test]
-gem 'database_cleaner', '>= 0.6.6', :group => :test
-gem 'cucumber-rails', ">= 0.4.0", :group => :test
-gem 'capybara', ">= 0.4.1.2", :group => :test
-gem "devise", ">= 1.2.0"
-gem 'mongoid-rspec', ">= 1.4.1", :group => :test
-gem 'factory_girl_rails', ">= 1.1.beta1", :group => :test
-gem 'relish', ">= 0.2.2", :group => :development
+gem 'rails', '3.0.6'
+gem "rspec-rails", ">= 2.5.0", :group => [:development, :test]
+gem "database_cleaner", ">= 0.6.6", :group => :test
+gem "mongoid-rspec", ">= 1.4.1", :group => :test
+gem "factory_girl_rails", ">= 1.1.beta1", :group => :test
+gem "cucumber-rails", ">= 0.4.1", :group => :test
+gem "capybara", ">= 0.4.1.2", :group => :test
+gem "launchy", ">= 0.4.0", :group => :test
+gem "bson_ext", ">= 1.3.0"
+gem "mongoid", ">= 2.0.1"
+gem "devise", ">= 1.3.0"
View
@@ -1,7 +1,7 @@
<%
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
%>
default: <%= std_opts %> features
wip: --tags @wip:3 --wip features
@@ -3,7 +3,7 @@
Devise.setup do |config|
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in DeviseMailer.
- config.mailer_sender = "please-change-me@config-initializers-devise.com"
+ config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"
@@ -34,7 +34,7 @@
# Configure which authentication keys should be case-insensitive.
# These keys will be downcased upon creating or modifying a user and when used
# to authenticate or find a user. Default is :email.
- # config.case_insensitive_keys = [ :email ]
+ config.case_insensitive_keys = [ :email ]
# Tell if authentication through request.params is enabled. True by default.
# config.params_authenticatable = true
@@ -53,6 +53,9 @@
# using other encryptors, it sets how many times you want the password re-encrypted.
config.stretches = 10
+ # Setup a pepper to generate the encrypted password.
+ # config.pepper = "ea6d4816b271609531c57e1996b9f6f3c91bc3ed272ebad3f842d8bf860534ddc23ae524d199316e8bf96dc15e11cbb42a6e3a275c9011638093dc78cce87565"
+
# ==> Configuration for :confirmable
# The time you want to give your user to confirm his account. During this time
# he will be able to access your application without confirming. Default is 0.days
@@ -62,6 +65,9 @@
# (ie 2 days).
# config.confirm_within = 2.days
+ # Defines which key will be used when confirming an account
+ # config.confirmation_keys = [ :email ]
+
# ==> Configuration for :rememberable
# The time the user will be remembered without asking for credentials again.
# config.remember_for = 2.weeks
@@ -76,12 +82,16 @@
# to false if you are not using database authenticatable.
config.use_salt_as_remember_token = true
+ # Options to be passed to the created cookie. For instance, you can set
+ # :secure => true in order to force SSL only cookies.
+ # config.cookie_options = {}
+
# ==> Configuration for :validatable
- # Range for password length. Default is 6..20.
- # config.password_length = 6..20
+ # Range for password length. Default is 6..128.
+ # config.password_length = 6..128
# Regex to use to validate the email address
- # config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
+ # config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
# ==> Configuration for :timeoutable
# The time you want to timeout the user session without activity. After this
@@ -94,6 +104,9 @@
# :none = No lock strategy. You should handle locking by yourself.
# config.lock_strategy = :failed_attempts
+ # Defines which key will be used when locking and unlocking an account
+ # config.unlock_keys = [ :email ]
+
# Defines which strategy will be used to unlock an account.
# :email = Sends an unlock link to the user email
# :time = Re-enables login after a certain amount of time (see :unlock_in below)
@@ -108,6 +121,16 @@
# Time interval to unlock the account if :time is enabled as unlock_strategy.
# config.unlock_in = 1.hour
+ # ==> Configuration for :recoverable
+ #
+ # Defines which key will be used when recovering the password for an account
+ # config.reset_password_keys = [ :email ]
+
+ # Time interval you can reset your password with a reset password key.
+ # Don't put a too small interval or your users won't have the time to
+ # change their passwords.
+ config.reset_password_within = 2.hours
+
# ==> Configuration for :encryptable
# Allow you to use another encryption algorithm besides bcrypt (default). You can use
# :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
@@ -116,9 +139,6 @@
# REST_AUTH_SITE_KEY to pepper)
# config.encryptor = :sha512
- # Setup a pepper to generate the encrypted password.
- # config.pepper = "38981e01b70a2edd48a67dd520a79472b792b2e790ca30f4243224c7eb9050c1d02e0d9e15d4df7d1f752ee5653b93bde423bc2e6c0bfdf7023ac84700baa656"
-
# ==> Configuration for :token_authenticatable
# Defines name of the authentication token params key
# config.token_authentication_key = :auth_token
@@ -150,8 +170,9 @@
# If you have any extra navigational formats, like :iphone or :mobile, you
# should add them to the navigational formats lists.
#
- # The :"*/*" format below is required to match Internet Explorer requests.
- # config.navigational_formats = [:"*/*", :html]
+ # The :"*/*" and "*/*" formats below is required to match Internet
+ # Explorer requests.
+ # config.navigational_formats = [:"*/*", "*/*", :html]
# The default HTTP method used to sign out a resource. Default is :get.
# config.sign_out_via = :get
@@ -1,3 +1,5 @@
+# Additional translations at http://github.com/plataformatec/devise/wiki/I18n
+
en:
errors:
messages:
@@ -10,6 +12,7 @@ en:
devise:
failure:
+ already_authenticated: 'You are already signed in.'
unauthenticated: 'You need to sign in or sign up before continuing.'
unconfirmed: 'You have to confirm your account before continuing.'
locked: 'Your account is locked.'
View
@@ -1,2 +0,0 @@
-Use this README file to introduce your application and point to useful places in the API for learning more.
-Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
Oops, something went wrong.

0 comments on commit 3ca4fe2

Please sign in to comment.