diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-26 10:14:40 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-26 10:14:40 -0800 |
| commit | bf3ddfa28da8ca837ddce8c6744a6c1fd9a51243 (patch) | |
| tree | c96839ac99bcf2142939a728b56116679bf0f909 /guides/code/getting_started/Gemfile | |
| parent | e5e440f477a0b5e06b008ee77e3c635049405957 (diff) | |
| parent | 3225898513434ded93fe3abe51ba700f5bd9db84 (diff) | |
| download | rails-bf3ddfa28da8ca837ddce8c6744a6c1fd9a51243.tar.gz rails-bf3ddfa28da8ca837ddce8c6744a6c1fd9a51243.tar.bz2 rails-bf3ddfa28da8ca837ddce8c6744a6c1fd9a51243.zip | |
Merge branch 'master' into adequaterecord
* master: (55 commits)
[ci skip] Move association class method notes
extract common code in `uuid_test.rb`.
move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`.
[ci skip] remove guide section on models in migrations
test case for custom PostgreSQL enum type.
Remove inclusion of rubysl gem for rbx on generated Gemfile
let `insert_record` actuall save the object.
[skip ci] Fix test name typo in app generator tests.
travis s/2.1.0/2.1.1
Bump version of bcrypt gem
Skip test_migrate_revert_add_index_with_name if databases do not allow to create duplicate indexes on the same columns
Optimize getting started guide images, and use png instead of jpg
:scissors: [ci skip]
Point master changelogs to 4-1-stable branch
Add missing parantheses in index_exists?
`ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.
[skip ci] Standardized punctuation.
[skip ci] Fix typo in link_to :method option description
refactor, with_locale is not needed because I18n is mocked.
Fix ActionView label translation for more than 10 nested elements
...
Diffstat (limited to 'guides/code/getting_started/Gemfile')
| -rw-r--r-- | guides/code/getting_started/Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile index ecb6e7aa1a..c3d7e96c4d 100644 --- a/guides/code/getting_started/Gemfile +++ b/guides/code/getting_started/Gemfile @@ -27,7 +27,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc gem 'spring', group: :development # Use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.1.2' +# gem 'bcrypt', '~> 3.1.7' # Use unicorn as the app server # gem 'unicorn' |