Merge remote-tracking branch 'ValiMail/feature/rails_4_devise_3'

.gitignore

@@ -1,52 +1,39 @@
-# rcov generated
-coverage
-coverage.data
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-
-.DS_Store
-
-# For TextMate
-*.tmproj
-tmtags
-
-# For emacs:
-*~
-\#*
-.\#*
-
-# For vim:
-*.swp
-
-# For redcar:
-#.redcar
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
-# For rubinius:
-#*.rbc
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
 
 spec/rails-app/tmp
 spec/rails-app/db
@@ -55,8 +42,3 @@ spec/rails-app/log
 
 initializers/authy.rb
 
-# For RBENV
-.ruby-version
-
-# For RubyMine
-.idea

Gemfile

@@ -1,25 +1,40 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "devise", '< 3.0.0'
+gem 'devise', '>= 3.0.0'
 gem 'authy'
 
 group :development do
-  gem "rspec", "> 2.14.1", "< 3.0"
-  gem "yard"
-  gem "rdoc"
-  gem "bundler"
-  gem "jeweler", ">= 2.0.1"
-  gem "simplecov"
-  gem "sass-rails"
-  gem "jquery-rails"
-  gem "pry"
+  gem 'rspec', '> 3.0.0'
+  gem 'yard'
+  gem 'rdoc'
+  gem 'bundler'
+  gem 'jeweler', '>= 2.0.1'
+  gem 'simplecov'
+  gem 'byebug'
 end
 
 group :test do
-  gem "rails", "~> 3.2.6"
-  gem "sqlite3"
+  gem 'rails', '~> 4.2.5'
+  gem 'sqlite3'
+
+  # Use SCSS for stylesheets
+  gem 'sass-rails', '~> 5.0'
+
+  # Use Uglifier as compressor for JavaScript assets
+  gem 'uglifier', '>= 1.3.0'
+
+  # Use CoffeeScript for .coffee assets and views
+  gem 'coffee-rails', '~> 4.1.0'
+
+  # Use jquery as the JavaScript library
+  gem 'jquery-rails'
+
+  gem 'launchy'
   gem 'rspec-rails'
   gem 'database_cleaner'
   gem 'capybara'
   gem 'test-unit'
 end
+
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0', group: :doc