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

Update Rails to 4.1.1 & use plain bcrypt. #26

Merged
merged 1 commit into from
May 18, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '4.1.0'
gem 'rails', '4.1.1'

# Use postgresql as the database for Active Record
gem 'pg'
Expand Down Expand Up @@ -45,8 +45,10 @@ gem 'redcarpet', '~> 3.0.0'
# Code highlight
gem 'rouge', '~> 1.3.1'

# Use ActiveModel has_secure_password
gem 'bcrypt-ruby', '~> 3.1.2'
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid ActiveModel (and by extension the entire framework)
# being dependent on a binary library.
gem 'bcrypt', '~> 3.1.7', require: false

# Paignator
gem 'kaminari', '~> 0.15.1'
Expand Down
66 changes: 33 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
actionmailer (4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
mail (~> 2.5.4)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
actionpack (4.1.1)
actionview (= 4.1.1)
activesupport (= 4.1.1)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.0)
activesupport (= 4.1.0)
actionview (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
activemodel (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
activerecord (4.1.0)
activemodel (= 4.1.0)
activesupport (= 4.1.0)
activerecord (4.1.1)
activemodel (= 4.1.1)
activesupport (= 4.1.1)
arel (~> 5.0.0)
activesupport (4.1.0)
activesupport (4.1.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
arel (5.0.0)
bcrypt-ruby (3.1.2)
arel (5.0.1.20140414130214)
bcrypt (3.1.7)
bootstrap-sass (3.1.0.1)
sass (~> 3.2)
builder (3.2.2)
Expand Down Expand Up @@ -149,9 +149,9 @@ GEM
mini_magick (3.7.0)
subexec (~> 0.2.1)
mini_portile (0.5.2)
minitest (5.3.2)
minitest (5.3.4)
mono_logger (1.1.0)
multi_json (1.9.2)
multi_json (1.10.0)
multipart-post (2.0.0)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
Expand All @@ -171,25 +171,25 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.0)
actionmailer (= 4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
rails (4.1.1)
actionmailer (= 4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
activemodel (= 4.1.1)
activerecord (= 4.1.1)
activesupport (= 4.1.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.0)
railties (= 4.1.1)
sprockets-rails (~> 2.0)
rails-i18n (4.0.1)
i18n (~> 0.6)
rails (~> 4.0)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
railties (4.1.1)
actionpack (= 4.1.1)
activesupport (= 4.1.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.2.2)
rake (10.3.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
Expand Down Expand Up @@ -226,7 +226,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.1)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
Expand Down Expand Up @@ -260,7 +260,7 @@ PLATFORMS
ruby

DEPENDENCIES
bcrypt-ruby (~> 3.1.2)
bcrypt (~> 3.1.7)
bootstrap-sass (~> 3.1.0)
capistrano (~> 3.1.0)
capistrano-bundler (~> 1.1.2)
Expand All @@ -284,7 +284,7 @@ DEPENDENCIES
nokogiri (~> 1.6.1)
pg
rack-livereload
rails (= 4.1.0)
rails (= 4.1.1)
rails-i18n (~> 4.0.1)
redcarpet (~> 3.0.0)
redis (~> 3.0.7)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ It's good for:

## Build with

- Ruby 2.1 and Rails 4.1.0-beta1(Will be update after stable release)
- Ruby 2.1 and Rails 4.1.1
- Postgresql 9.1+ for databsae
- elasticsearch 1.0+ for full text searching
- Redis for backgound jobs
Expand Down