| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
...
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* master: (311 commits)
Add a missing changelog entry for #13981 and #14035
Revert "Fixed plugin_generator test"
implements new option :month_format_string for date select helpers [Closes #13618]
add factory methods for empty alias trackers
guarantee a list in the alias tracker so we can remove a conditional
stop exposing table_joins
make most parameters to the AliasTracker required
make a singleton for AssociationScope
pass the association and connection to the scope method
pass the tracker down the stack and construct it in the scope method
clean up add_constraints signature
remove the reflection delegate
remove klass delegator
remove railties changes. fixes #14054
remove chain delegate
remove scope_chain delegate
Add verb to sanitization note
fix path shown in mailer's templates
updated Travis build status image url
fix guide active_support_core_extensions. add Note to String#indent [ci skip]
...
Conflicts:
activerecord/lib/active_record/associations/join_dependency.rb
activerecord/test/cases/associations/association_scope_test.rb
|
| |
| |
| |
| | |
/cc @brixen
|
| | |
|
|/ |
|
|
|
|
| |
Kudos to @zzak for taking over SDoc and make it work with RDoc 4.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even
if not included in the Gemfile. Now it's 100% required to include the
gem 'rubysl', otherwise the stdlib is not available entirely, breaking
everything.
Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing
conflicts with Rails's dependency on minitest 5. That is not the case
anymore since rubysl-test-unit 2.0.2, so it is completely safe to
include it fully.
When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2,
thus picking new versions automatically.
|
|
|
|
|
|
| |
This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5.
> The `master` branch should use the `master` branch.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
this resolves the following error when running `bundle install`
```
ArgumentError: wrong number of arguments (2 for 1)
/Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update'
```
The build is still broken with lots of:
```
ArgumentError: wrong number of arguments (2 for 1)
/Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update'
```
|
| |
|
|
|
|
| |
Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
|
| |
|
| |
|
|\
| |
| | |
allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
|
| | |
|
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
|
|/ |
|
| |
|
| |
|
|
|
|
|
| |
Switch to master branch which provides Version 1.3.x of AR-JDBC adapter.
It strives to provide ActiveRecord 4.x compatibility (as well as still supporting 2.3 and 3.x) from a single code base. It's a recommended update for all AR-JDBC 1.2.x users.
|
|
|
|
| |
Fixes #11457
|
| |
|
|
|
|
| |
#11457 for details
|
| |
|
|
|
|
|
|
|
|
|
|
| |
- https://travis-ci.org/rails/rails/jobs/7264822 contains deprecated
warnings given by Mocha version 0.14
- 632f215da added Mocha 0.14 to Gemfile
- But with the version, require: false was removed
- So Mocha started giving deprecation warnings
- Acc.to Mocha documentation(https://github.com/freerange/mocha#bundler)
it should not be auto required.
|
| |
|
|\
| |
| | |
Squishy minitest5
|
| | |
|
|/ |
|
| |
|
| |
|
|
|
|
| |
Related with 575838795019f7402992e3bfa83a0c5048cf143d
|
| |
|
|
|
|
| |
This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980.
|
| |
|
|
|
|
|
|
|
| |
See
https://github.com/wycats/thor/commit/08265a380d0ff3fce014e98e87bb8c2330858e4a
for the discussion and https://github.com/wycats/thor/pull/316 for the
fix
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Using latest AR-JDBC for JRuby
|
| |
|