Skip to content

Sign up #4

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.

Sign up for GitHub

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

Open
okgoodla wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Sign up #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e770fa5
Update Rails version & eliminate specific Ruby
mhartl Nov 14, 2014
40eeb95
Update the Guardfile
mhartl Nov 14, 2014
e4f5bed
Remove unused gem
mhartl Nov 22, 2014
03c56d6
Add explicit arel gem
mhartl Nov 26, 2014
b09bc7c
Update to Rails 4.2.0.rc1
mhartl Nov 29, 2014
73cc776
Update to Rails 4.2.0.rc1
mhartl Nov 29, 2014
2bedeab
Update coffee-rails
mhartl Nov 29, 2014
572a595
Change navbar css
mhartl Dec 13, 2014
89b4a38
Bump version number
mhartl Dec 13, 2014
1a944c5
Update Rails
mhartl Dec 30, 2014
4d95478
Change to f.email_field
mhartl Jan 6, 2015
def2f2e
Update config.serve_static_files
mhartl Jan 6, 2015
27a390f
Improve email length validation test
mhartl Jan 7, 2015
e3cde45
Update gems & config
mhartl Jan 17, 2015
0a9b828
Update gems & config
mhartl Jan 17, 2015
e940425
Update Gemfile
mhartl Jan 17, 2015
6f06c1a
Add schema
mhartl Jan 17, 2015
29229fc
Add schema
mhartl Jan 17, 2015
2c35174
Add SSL and Puma webserver in production
mhartl Feb 16, 2015
b6100ed
Update Gemfile
mhartl Feb 16, 2015
446cd8a
Merge branch 'sign-up' of bitbucket.org:railstutorial/sample_app into…
mhartl Feb 16, 2015
51afdf9
Fix conflict
mhartl Feb 16, 2015
7e7a3c8
Remove overflow-y rulse
mhartl Feb 16, 2015
10a2ebe
Add Sass dependency
mhartl Apr 13, 2015
7a220c0
Use better fix for Sass issue
mhartl Apr 17, 2015
8e04686
Switch to string concatenation in full_helper
mhartl May 8, 2015
c6fd9d2
Add test for blank passwords and a presence validation
mhartl May 22, 2015
ebe77a6
Bump version number
mhartl Jun 17, 2015
3be7c0b
Remove erroneous presence validation
mhartl Sep 29, 2015
e0aed36
Go back to previous solution
mhartl Sep 29, 2015
0e15732
Update Puma
mhartl Mar 11, 2016
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
16 changes: 7 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
source 'https://rubygems.org'
ruby '2.1.1'

gem 'rails', '4.2.0.beta2'
gem 'rails', '4.2.2'
gem 'bcrypt', '3.1.7'
gem 'faker', '1.4.2'
gem 'carrierwave', '0.10.0'
Expand All @@ -10,13 +9,12 @@ gem 'fog', '1.23.0'
gem 'will_paginate', '3.0.7'
gem 'bootstrap-will_paginate', '0.0.10'
gem 'bootstrap-sass', '3.2.0.0'
gem 'sass-rails', '5.0.0.beta1'
gem 'sass-rails', '5.0.2'
gem 'uglifier', '2.5.3'
gem 'coffee-rails', '4.0.1'
gem 'jquery-rails', '3.1.2'
gem 'coffee-rails', '4.1.0'
gem 'jquery-rails', '4.0.3'
gem 'turbolinks', '2.3.0'
gem 'jbuilder', '2.1.3'
gem 'rails-html-sanitizer', '1.0.1'
gem 'jbuilder', '2.2.3'
gem 'sdoc', '0.4.0', group: :doc

group :development, :test do
Expand All @@ -35,5 +33,5 @@ end
group :production do
gem 'pg', '0.17.1'
gem 'rails_12factor', '0.0.2'
gem 'unicorn', '4.8.3'
end
gem 'puma', '3.1.0'
end
216 changes: 109 additions & 107 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.0.beta2)
actionpack (= 4.2.0.beta2)
actionview (= 4.2.0.beta2)
activejob (= 4.2.0.beta2)
actionmailer (4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.3)
actionpack (4.2.0.beta2)
actionview (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
rack (~> 1.6.0.beta)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.2)
actionview (= 4.2.2)
activesupport (= 4.2.2)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
actionview (4.2.2)
activesupport (= 4.2.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
activejob (4.2.2)
activesupport (= 4.2.2)
globalid (>= 0.3.0)
activemodel (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
activemodel (4.2.2)
activesupport (= 4.2.2)
builder (~> 3.1)
activerecord (4.2.0.beta2)
activemodel (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
arel (>= 6.0.0.beta1, < 6.1)
activesupport (4.2.0.beta2)
i18n (>= 0.7.0.beta1, < 0.8)
activerecord (4.2.2)
activemodel (= 4.2.2)
activesupport (= 4.2.2)
arel (~> 6.0)
activesupport (4.2.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.4.3)
arel (6.0.0.beta1)
ansi (1.5.0)
arel (6.0.0)
bcrypt (3.1.7)
binding_of_caller (0.7.3.pre1)
debug_inspector (>= 0.0.1)
Expand All @@ -58,168 +58,175 @@ GEM
celluloid (0.16.0)
timers (~> 4.0.0)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.8.0)
columnize (0.8.9)
coffee-script-source (1.9.1.1)
columnize (0.9.0)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
erubis (2.7.0)
excon (0.39.6)
execjs (2.2.1)
excon (0.45.2)
execjs (2.5.2)
faker (1.4.2)
i18n (~> 0.5)
ffi (1.9.5)
ffi (1.9.8)
fog (1.23.0)
fog-brightbox
fog-core (~> 1.23)
fog-json
fog-softlayer
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
fog-brightbox (0.5.1)
fog-brightbox (0.7.1)
fog-core (~> 1.22)
fog-json
inflecto
fog-core (1.24.0)
inflecto (~> 0.0.2)
fog-core (1.30.0)
builder
excon (~> 0.38)
excon (~> 0.45)
formatador (~> 0.2)
mime-types
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
fog-json (1.0.0)
fog-json (1.0.1)
fog-core (~> 1.0)
multi_json (~> 1.0)
fog-softlayer (0.3.18)
fog-softlayer (0.4.5)
fog-core
fog-json
formatador (0.2.5)
globalid (0.3.0)
globalid (0.3.5)
activesupport (>= 4.1.0)
guard (2.6.1)
guard (2.12.5)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-minitest (2.3.1)
guard (~> 2.0)
minitest (>= 3.0)
hike (1.2.3)
hitimes (1.2.2)
i18n (0.7.0.beta1)
i18n (0.7.0)
inflecto (0.0.2)
ipaddress (0.8.0)
jbuilder (2.1.3)
jbuilder (2.2.3)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
jquery-rails (4.0.3)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
kgio (2.9.2)
listen (2.7.11)
celluloid (>= 0.15.2)
json (1.8.3)
listen (2.10.0)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.0.1)
loofah (2.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.1)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.3)
mime-types (2.6.1)
mini_backtrace (0.1.3)
minitest (> 1.2.0)
rails (>= 2.3.3)
mini_magick (3.8.0)
subexec (~> 0.2.1)
mini_portile (0.6.0)
minitest (5.4.2)
mini_portile (0.6.2)
minitest (5.7.0)
minitest-reporters (1.0.5)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.10.1)
multi_json (1.11.1)
nenv (0.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
net-ssh (2.9.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
notiffany (0.0.6)
nenv (~> 0.1)
shellany (~> 0.0)
pg (0.17.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.0.beta)
rack-test (0.6.2)
puma (2.11.1)
rack (>= 1.1, < 2.0)
rack (1.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.0.beta2)
actionmailer (= 4.2.0.beta2)
actionpack (= 4.2.0.beta2)
actionview (= 4.2.0.beta2)
activejob (= 4.2.0.beta2)
activemodel (= 4.2.0.beta2)
activerecord (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
rails (4.2.2)
actionmailer (= 4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
activemodel (= 4.2.2)
activerecord (= 4.2.2)
activesupport (= 4.2.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0.beta2)
sprockets-rails (~> 3.0.0.beta1)
railties (= 4.2.2)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.3)
activesupport
rails-dom-testing (1.0.6)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
railties (4.2.0.beta2)
actionpack (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
railties (4.2.2)
actionpack (= 4.2.2)
activesupport (= 4.2.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
rb-fsevent (0.9.4)
rake (10.4.2)
rb-fsevent (0.9.5)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (4.1.2)
rdoc (4.2.0)
json (~> 1.4)
ruby-progressbar (1.6.0)
sass (3.4.5)
sass-rails (5.0.0.beta1)
ruby-progressbar (1.7.5)
sass (3.4.13)
sass-rails (5.0.2)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
sprockets (~> 2.12)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
shellany (0.0.1)
slop (3.6.0)
spring (1.1.3)
sprockets (2.12.2)
hike (~> 1.2)
multi_json (~> 1.0)
sprockets (3.2.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (3.0.0.beta1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (~> 2.8)
sprockets-rails (2.3.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9)
subexec (0.2.3)
thor (0.19.1)
thread_safe (0.3.4)
thread_safe (0.3.5)
tilt (1.4.1)
timers (4.0.1)
hitimes
Expand All @@ -230,10 +237,6 @@ GEM
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
web-console (2.0.0.beta3)
activemodel (~> 4.0)
binding_of_caller (= 0.7.3.pre1)
Expand All @@ -250,25 +253,24 @@ DEPENDENCIES
bootstrap-will_paginate (= 0.0.10)
byebug (= 3.4.0)
carrierwave (= 0.10.0)
coffee-rails (= 4.0.1)
coffee-rails (= 4.1.0)
faker (= 1.4.2)
fog (= 1.23.0)
guard-minitest (= 2.3.1)
jbuilder (= 2.1.3)
jquery-rails (= 3.1.2)
jbuilder (= 2.2.3)
jquery-rails (= 4.0.3)
mini_backtrace (= 0.1.3)
mini_magick (= 3.8.0)
minitest-reporters (= 1.0.5)
pg (= 0.17.1)
rails (= 4.2.0.beta2)
rails-html-sanitizer (= 1.0.1)
puma (= 2.11.1)
rails (= 4.2.2)
rails_12factor (= 0.0.2)
sass-rails (= 5.0.0.beta1)
sass-rails (= 5.0.2)
sdoc (= 0.4.0)
spring (= 1.1.3)
sqlite3 (= 1.3.9)
turbolinks (= 2.3.0)
uglifier (= 2.5.3)
unicorn (= 4.8.3)
web-console (= 2.0.0.beta3)
will_paginate (= 3.0.7)
Loading