Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Devise error message #60

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
2562b48
bundle update
kathyonu Apr 8, 2012
7fa6b11
added and git ignored fork_data folder
kathyonu Apr 9, 2012
1fda96f
updated bundle
kathyonu Apr 10, 2012
bcc82fc
Merge remote branch 'upstream/master'
kathyonu Apr 10, 2012
6f74cf5
updated gemset to 1.9.3-p194@rails323
kathyonu May 6, 2012
e37c85a
Gemfile.lock changes from upstream
kathyonu May 6, 2012
57fcfc2
upstream changes
kathyonu May 6, 2012
d4d0aa0
Merge remote branch 'upstream/master'
kathyonu May 6, 2012
f7756a8
merged upstream, bundle installed
kathyonu May 6, 2012
30d5f93
Merge remote branch 'upstream/master'
kathyonu May 10, 2012
f985b4c
Merge remote branch 'upstream/master'
kathyonu May 10, 2012
2967b71
Merge remote branch 'upstream/master'
kathyonu May 17, 2012
58694fb
fetched upstream, merged, bundle installed and updated
kathyonu May 24, 2012
c896672
gemfile changes in attempt to fire up bundle/heroku
kathyonu May 28, 2012
c653f22
Merge remote branch 'upstream/master'
kathyonu May 28, 2012
51210c5
fetched upstream, merged master, commented out one line in our Gemfil…
kathyonu May 28, 2012
442f902
Merge remote branch 'upstream/master'
kathyonu Jun 2, 2012
d681bca
Merge remote-tracking branch 'upstream/master'
kathyonu Jun 4, 2012
0cf5225
Merge remote-tracking branch 'upstream/master'
kathyonu Jun 5, 2012
30f2c18
rails to 3.2.5 and Mandrill setups
kathyonu Jun 6, 2012
83a8d78
update gemset to rails325
kathyonu Jun 6, 2012
cac8bf6
changed config.mailer_sender
kathyonu Jun 7, 2012
5eb05e9
updated to bundler 1.2.0.pre.1
kathyonu Jun 7, 2012
4630009
added ruby 1.9.3 to gemfile
kathyonu Jun 7, 2012
72671a9
adjusted gemfile, bundle update
kathyonu Jun 7, 2012
1a03112
bundle installed heroku
kathyonu Jun 7, 2012
f9f8229
Merge remote-tracking branch 'upstream/master'
kathyonu Jun 7, 2012
7b80382
merge upstream
kathyonu Jun 11, 2012
8402763
Merge remote-tracking branch 'upstream/master'
kathyonu Jun 13, 2012
1cd9070
merged upstream, removed config/database.yml from ./.gitignore file
kathyonu Jun 13, 2012
f2cd311
fixed deprecation notice on :confirm
kathyonu Jun 13, 2012
5d64451
explanation for seeds.db in production
kathyonu Jun 13, 2012
00c1079
keeping our database.yml for heroku reasons
kathyonu Jun 17, 2012
11d6355
bundle update to rails 3.2.6
kathyonu Jul 11, 2012
86ef880
merged upstream
kathyonu Jul 11, 2012
85bcef2
bundle update
kathyonu Jul 31, 2012
1a5ffeb
updated to Rails 3.2.7
kathyonu Jul 31, 2012
c1d40fe
updated to Rails 3.2.8
kathyonu Aug 23, 2012
0ad2134
Merge remote-tracking branch 'upstream/master'
kathyonu Aug 23, 2012
271f70b
merged upstream
kathyonu Aug 23, 2012
6f25660
bundle updated
kathyonu Sep 3, 2012
2cb52a1
merged upstream
kathyonu Sep 3, 2012
d947ef2
merged upstream all tests pass
kathyonu Sep 3, 2012
4d39a1a
Merge remote-tracking branch 'upstream/master'
kathyonu Sep 17, 2012
ec076a9
merged upstream, bundle updated
kathyonu Nov 24, 2012
5ca628b
installed Heroku CLI, removed Heroku gem
kathyonu Nov 24, 2012
cf523d7
merge upstream
kathyonu Jan 6, 2013
a6061c5
updated to rails 3.2.10
kathyonu Jan 6, 2013
daef984
update to rails 3.2.11
kathyonu Jan 11, 2013
debda38
merged upstream/master
kathyonu Jan 11, 2013
fad30a5
updated to Ruby-2.0 Rails-3.2.12
kathyonu Mar 14, 2013
70eb759
merged upstream
kathyonu Mar 14, 2013
e3802f5
.rvmrc changes
kathyonu Mar 14, 2013
88076e1
updated Ruby-2.0 Rails-3.2.13.rc2
kathyonu Mar 15, 2013
8ac2f0c
merged upstream changes
kathyonu Apr 24, 2013
26b5bf2
merged upstream
kathyonu Jul 31, 2013
443e601
reset gibbon gem to 0.4.6
kathyonu Aug 1, 2013
8d9e268
reverted confing/environments/production.rb
kathyonu Aug 1, 2013
ef8a4a8
added devise error message, fixed method typo
kathyonu Apr 12, 2015
a51a166
running on Rails 4.0.0, tests need work
kathyonu Apr 13, 2015
8666883
now on Ruby2.1.0 Rails4.1.0, tests need work
kathyonu Apr 13, 2015
e5c4642
upgrade to Ruby2.2.1, Rails4.2.1
kathyonu Apr 14, 2015
67a62e2
shifted env variables to config/local_env.yml
kathyonu Apr 14, 2015
51bbc81
removed singular quotes on local_env_example.yml
kathyonu Apr 14, 2015
4ee64a4
update the .ruby-version file to 2.2.1
kathyonu Apr 14, 2015
a7c0631
changed to new hash form, added missed gems
kathyonu Apr 14, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ db/*.sqlite3
.rspec
.redcar/
.sass-cache
/config/config.yml
/config/application.yml
/config/database.yml
/config/config.yml
/config/local_env.yml
/config/secrets.yml
/coverage.data
/coverage/
/db/*.javadb/
Expand All @@ -37,6 +40,7 @@ db/*.sqlite3
/doc/app/
/doc/features.html
/doc/specs.html
/fork_data
/public/cache
/public/stylesheets/compiled
/public/system/*
Expand Down Expand Up @@ -72,6 +76,3 @@ pickle-email-*.html

# vim artifacts
**.swp

# Ignore application configuration
/config/application.yml
2 changes: 1 addition & 1 deletion .ruby-gemset
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rails-prelaunch-signup
Rails4.2_prelaunch
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.2.1
58 changes: 35 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,39 @@
source 'https://rubygems.org'
gem 'rails', '3.2.13'
ruby '2.2.1'
gem 'rails', '4.2.1'
gem 'rubyzip', '~> 1.0.0'
gem 'sqlite3'
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
group :development, :test do
gem 'binding_of_caller', '~> 0.7.2', platforms: [:mri_19, :rbx]
gem 'rspec-rails', '>= 2.12.2'
gem 'sass-rails', '~> 5.0'
gem 'factory_girl_rails', '>= 4.2.0'
end
group :test do
gem 'cucumber-rails', '>= 1.3.1', require: false
gem 'capybara', '>= 2.0.3'
gem 'database_cleaner', '>= 1.0.0.RC1'
gem 'email_spec', '>= 1.4.0'
gem 'launchy', '>= 2.2.0'
gem 'pry'
end
group :development do
gem 'quiet_assets', '>= 1.0.2'
gem 'better_errors', '>= 0.7.2'
gem 'spring', '~> 1.3.4'
end
gem 'bootstrap-sass', '~> 3.3.4.1'
gem 'cancan', '>= 1.6.9'
gem 'coffee-rails', '~> 4.1.0'
gem 'devise', '>= 2.2.3'
gem 'gibbon', git: 'git://github.com/amro/gibbon.git'
gem 'jquery-rails'
gem "rspec-rails", ">= 2.12.2", :group => [:development, :test]
gem "database_cleaner", ">= 1.0.0.RC1", :group => :test
gem "email_spec", ">= 1.4.0", :group => :test
gem "cucumber-rails", ">= 1.3.1", :group => :test, :require => false
gem "launchy", ">= 2.2.0", :group => :test
gem "capybara", ">= 2.0.3", :group => :test
gem "factory_girl_rails", ">= 4.2.0", :group => [:development, :test]
gem "bootstrap-sass", ">= 2.3.0.0"
gem "devise", ">= 2.2.3"
gem "cancan", ">= 1.6.9"
gem "rolify", ">= 3.2.0"
gem "simple_form", ">= 2.1.0"
gem "gibbon", ">= 0.4.2"
gem "selenium-webdriver", "~> 2.32.1"
gem "quiet_assets", ">= 1.0.2", :group => :development
gem "figaro", ">= 0.6.3"
gem "better_errors", ">= 0.7.2", :group => :development
gem "binding_of_caller", ">= 0.7.1", :group => :development, :platforms => [:mri_19, :rbx]
gem 'protected_attributes'
gem 'railties', '~> 4.2.0'
gem 'rolify', '>= 3.2.0'
gem 'responders', '~> 2.0'
gem 'rubygems-update', '~> 2.4.6'
gem 'selenium-webdriver', '~> 2.45.0'
gem 'simple_form', '>= 2.1.0'
gem 'uglifier', '~> 2.7.1'
gem 'web-console', '~> 2.0'
Loading