Code

Fixed Devise error message#60

Code

Open

kathyonu wants to merge 66 commits intoRailsApps:masterRailsApps/rails-prelaunch-signup:masterfrom kathyonu:masterkathyonu/rails-prelaunch-signup:masterCopy head branch name to clipboard

+838-1,152

Commits

Commits on Apr 8, 2012

• bundle update

  kathyonu

  committed
  2562b48

  Copy full SHA for 2562b48

Commits on Apr 9, 2012

• added and git ignored fork_data folder

  kathyonu

  committed
  7fa6b11

  Copy full SHA for 7fa6b11

Commits on Apr 10, 2012

• updated bundle

  kathyonu

  committed
  1fda96f

  Copy full SHA for 1fda96f

• Merge remote branch 'upstream/master'

  kathyonu

  committed
  bcc82fc

  Copy full SHA for bcc82fc

Commits on May 6, 2012

• updated gemset to 1.9.3-p194@rails323

  kathyonu

  committed
  6f74cf5

  Copy full SHA for 6f74cf5

• Gemfile.lock changes from upstream

  kathyonu

  committed
  e37c85a

  Copy full SHA for e37c85a

• upstream changes

  kathyonu

  committed
  57fcfc2

  Copy full SHA for 57fcfc2

• Merge remote branch 'upstream/master'

  kathyonu

  committed
  d4d0aa0

  Copy full SHA for d4d0aa0

• merged upstream, bundle installed

  kathyonu

  committed
  f7756a8

  Copy full SHA for f7756a8

Commits on May 10, 2012

• Merge remote branch 'upstream/master'

  kathyonu

  committed
  30d5f93

  Copy full SHA for 30d5f93

• Merge remote branch 'upstream/master'

  kathyonu

  committed
  f985b4c

  Copy full SHA for f985b4c

Commits on May 17, 2012

• Merge remote branch 'upstream/master'

  kathyonu

  committed
  2967b71

  Copy full SHA for 2967b71

Commits on May 24, 2012

• fetched upstream, merged, bundle installed and updated

  kathyonu

  committed
  58694fb

  Copy full SHA for 58694fb

Commits on May 28, 2012

• gemfile changes in attempt to fire up bundle/heroku

  kathyonu

  committed
  c896672

  Copy full SHA for c896672

• Merge remote branch 'upstream/master'

  kathyonu

  committed
  c653f22

  Copy full SHA for c653f22

• fetched upstream, merged master, commented out one line in our Gemfile, all tests pass, lights up like a christmas tree

  kathyonu

  committed
  51210c5

  Copy full SHA for 51210c5

Commits on Jun 2, 2012

• Merge remote branch 'upstream/master'

  kathyonu

  committed
  442f902

  Copy full SHA for 442f902

Commits on Jun 4, 2012

• Merge remote-tracking branch 'upstream/master'

  kathyonu

  committed
  d681bca

  Copy full SHA for d681bca

Commits on Jun 5, 2012

• Merge remote-tracking branch 'upstream/master'

  kathyonu

  committed
  0cf5225

  Copy full SHA for 0cf5225

Commits on Jun 6, 2012

• rails to 3.2.5 and Mandrill setups

  kathyonu

  committed
  30f2c18

  Copy full SHA for 30f2c18

• update gemset to rails325

  kathyonu

  committed
  83a8d78

  Copy full SHA for 83a8d78

Commits on Jun 7, 2012

• changed config.mailer_sender

  kathyonu

  committed
  cac8bf6

  Copy full SHA for cac8bf6

• updated to bundler 1.2.0.pre.1

  kathyonu

  committed
  5eb05e9

  Copy full SHA for 5eb05e9

• added ruby 1.9.3 to gemfile

  kathyonu

  committed
  4630009

  Copy full SHA for 4630009

• adjusted gemfile, bundle update

  kathyonu

  committed
  72671a9

  Copy full SHA for 72671a9

• bundle installed heroku

  kathyonu

  committed
  1a03112

  Copy full SHA for 1a03112

• Merge remote-tracking branch 'upstream/master'

  kathyonu

  committed
  f9f8229

  Copy full SHA for f9f8229

Commits on Jun 11, 2012

• merge upstream

  kathyonu

  committed
  7b80382

  Copy full SHA for 7b80382

Commits on Jun 13, 2012

• Merge remote-tracking branch 'upstream/master'

  kathyonu

  committed
  8402763

  Copy full SHA for 8402763

• merged upstream, removed config/database.yml from ./.gitignore file

  kathyonu

  committed
  1cd9070

  Copy full SHA for 1cd9070

• fixed deprecation notice on :confirm

  kathyonu

  committed
  f2cd311

  Copy full SHA for f2cd311

• explanation for seeds.db in production

  kathyonu

  committed
  5d64451

  Copy full SHA for 5d64451

Commits on Jun 17, 2012

• keeping our database.yml for heroku reasons

  kathyonu

  committed
  00c1079

  Copy full SHA for 00c1079

Commits on Jul 11, 2012

• bundle update to rails 3.2.6

  kathyonu

  committed
  11d6355

  Copy full SHA for 11d6355

• merged upstream

  kathyonu

  committed
  86ef880

  Copy full SHA for 86ef880

Commits on Jul 31, 2012

• bundle update

  kathyonu

  committed
  85bcef2

  Copy full SHA for 85bcef2

• updated to Rails 3.2.7

  kathyonu

  committed
  1a5ffeb

  Copy full SHA for 1a5ffeb

Commits on Aug 23, 2012

• updated to Rails 3.2.8

  kathyonu

  committed
  c1d40fe

  Copy full SHA for c1d40fe

• Merge remote-tracking branch 'upstream/master'

  kathyonu

  committed
  0ad2134

  Copy full SHA for 0ad2134

• merged upstream

  kathyonu

  committed
  271f70b

  Copy full SHA for 271f70b

Commits on Sep 3, 2012

• bundle updated

  kathyonu

  committed
  6f25660

  Copy full SHA for 6f25660

• merged upstream

  kathyonu

  committed
  2cb52a1

  Copy full SHA for 2cb52a1

• merged upstream all tests pass

  kathyonu

  committed
  d947ef2

  Copy full SHA for d947ef2

Commits on Sep 17, 2012

• Merge remote-tracking branch 'upstream/master'

  kathyonu

  committed
  4d39a1a

  Copy full SHA for 4d39a1a

Commits on Nov 24, 2012

• merged upstream, bundle updated

  kathyonu

  committed
  ec076a9

  Copy full SHA for ec076a9

• installed Heroku CLI, removed Heroku gem

  kathyonu

  committed
  5ca628b

  Copy full SHA for 5ca628b

Commits on Jan 6, 2013

• merge upstream

  kathyonu

  committed
  cf523d7

  Copy full SHA for cf523d7

• updated to rails 3.2.10

  kathyonu

  committed
  a6061c5

  Copy full SHA for a6061c5

Commits on Jan 11, 2013

• update to rails 3.2.11

  kathyonu

  committed
  daef984

  Copy full SHA for daef984

• merged upstream/master

  kathyonu

  committed
  debda38

  Copy full SHA for debda38

Commits on Mar 14, 2013

• updated to Ruby-2.0 Rails-3.2.12

  kathyonu

  committed
  fad30a5

  Copy full SHA for fad30a5

• merged upstream

  kathyonu

  committed
  70eb759

  Copy full SHA for 70eb759

• .rvmrc changes

  kathyonu

  committed
  e3802f5

  Copy full SHA for e3802f5

Commits on Mar 15, 2013

• updated Ruby-2.0 Rails-3.2.13.rc2

  kathyonu

  committed
  88076e1

  Copy full SHA for 88076e1

Commits on Apr 24, 2013

• merged upstream changes

  kathyonu

  committed
  8ac2f0c

  Copy full SHA for 8ac2f0c

Commits on Jul 31, 2013

• merged upstream

  kathyonu

  committed
  26b5bf2

  Copy full SHA for 26b5bf2

Commits on Aug 1, 2013

• reset gibbon gem to 0.4.6

  kathyonu

  committed
  443e601

  Copy full SHA for 443e601

• reverted confing/environments/production.rb

  kathyonu

  committed
  8d9e268

  Copy full SHA for 8d9e268

Commits on Apr 12, 2015

• added devise error message, fixed method typo

  kathyonu

  committed
  ef8a4a8

  Copy full SHA for ef8a4a8

Commits on Apr 13, 2015

• running on Rails 4.0.0, tests need work

  kathyonu

  committed
  a51a166

  Copy full SHA for a51a166

• now on Ruby2.1.0 Rails4.1.0, tests need work

  kathyonu

  committed
  8666883

  Copy full SHA for 8666883

Commits on Apr 14, 2015

• upgrade to Ruby2.2.1, Rails4.2.1

  kathyonu

  committed
  e5c4642

  Copy full SHA for e5c4642

• shifted env variables to config/local_env.yml

  kathyonu

  committed
  67a62e2

  Copy full SHA for 67a62e2

• removed singular quotes on local_env_example.yml

  kathyonu

  committed
  51bbc81

  Copy full SHA for 51bbc81

• update the .ruby-version file to 2.2.1

  kathyonu

  committed
  4ee64a4

  Copy full SHA for 4ee64a4

• changed to new hash form, added missed gems

  kathyonu

  committed
  a7c0631

  Copy full SHA for a7c0631