aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #25961 from Azzurrio/masterRafael França2016-07-284-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix accessing provider_job_id inside active jobs for sidekiq adapterAzzurrio2016-07-284-1/+18
* | | | | | | | | Merge pull request #25952 from harfangk/masterप्रथमेश Sonpatki2016-07-281-19/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated getting_started guide to reflect the change in error message for Acti...Bonghyun Kim2016-07-281-19/+14
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Do not require rb-inotifyRafael Mendonça França2016-07-271-1/+1
* | | | | | | | | Use a form of rb-inotify to fix broken tests with Ruby 2.2.5Rafael Mendonça França2016-07-272-2/+12
* | | | | | | | | Merge pull request #25767 from kamipo/association_name_is_the_same_as_join_ta...Rafael França2016-07-274-3/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly return `associated_table` when `associated_with?` is trueRyuta Kamizono2016-07-104-3/+20
* | | | | | | | | | Add the TABLE_SCHEMA condition to the SELECT statement in table_comment (#25945)Takeshi AKIMA2016-07-272-1/+6
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #25702 from k0kubun/joins-circular-referenceSean Griffin2016-07-272-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove circular join references in join_dependencyTakashi Kokubun2016-07-282-1/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25963 from bdewater/auth_tag_docRafael França2016-07-271-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add rationale for manually checking auth_tag length, which got lost when #258...Bart de Water2016-07-271-0/+4
| |/ / / / / / / /
* | | | | | | | | Merge pull request #25913 from chrisarcand/fix-keyed-defaults-with-rootRafael Mendonça França2016-07-273-1/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update changelogChris Arcand2016-07-261-0/+7
| * | | | | | | | | Fix 'defaults' option for root routeChris Arcand2016-07-212-1/+26
* | | | | | | | | | Generators and tests are under the same style rulesRafael Mendonça França2016-07-271-14/+0
* | | | | | | | | | Bump arelRafael Mendonça França2016-07-271-2/+2
* | | | | | | | | | Merge pull request #25938 from kamipo/decouple_statement_cache_from_connectio...Rafael França2016-07-272-10/+10
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Decouple statement cache from connection adapterRyuta Kamizono2016-07-242-10/+10
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25958 from kamipo/should_be_target_loadedYves Senn2016-07-271-0/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add an assertion to the tests that should be loaded the target.Ryuta Kamizono2016-07-271-0/+38
* | | | | | | | | | Merge pull request #25408 from kamipo/should_not_reuse_quoted_trueYves Senn2016-07-273-5/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Quoting booleans should return a frozen stringRyuta Kamizono2016-07-273-5/+21
* | | | | | | | | | | There are some cases where @@app is not definedSantiago Pastorino2016-07-263-20/+33
* | | | | | | | | | | Merge pull request #25523 from kamipo/extract_quoted_binds_type_casted_bindsSean Griffin2016-07-264-6/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Extract `type_casted_binds` methodRyuta Kamizono2016-07-264-6/+10
* | | | | | | | | | | | Be more explicit with the expected resultSantiago Pastorino2016-07-261-1/+1
* | | | | | | | | | | | Return ActionDispatch.test_app when no app is set on IntegrationTest.app methodSantiago Pastorino2016-07-262-1/+20
* | | | | | | | | | | | Merge pull request #25919 from benpickles/skip-javascript-also-skips-uglifierGuillermo Iguaran2016-07-264-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | A generated app should not include Uglifier with `--skip-javascript` option.Ben Pickles2016-07-264-3/+18
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #25912 from stevenharman/fix_render_partial_collection_to_...Santiago Pastorino2016-07-263-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use to_a to pre-buffer the collectionSteven Harman2016-07-262-8/+7
| * | | | | | | | | | | Default to an empty collection if falsey givenSteven Harman2016-07-261-1/+1
| * | | | | | | | | | | Use Ruby >= 1.9 hash syntax as is the preferenceSteven Harman2016-07-261-1/+1
| * | | | | | | | | | | Fix collection_from_options to allow EnumeratorsSteven Harman2016-07-263-1/+21
* | | | | | | | | | | | Merge pull request #25929 from kamipo/load_target_is_public_methodSantiago Pastorino2016-07-263-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | `load_target` is a public methodRyuta Kamizono2016-07-233-7/+5
* | | | | | | | | | | | Merge pull request #25953 from kamipo/make_force_signal37_to_load_all_clients...Santiago Pastorino2016-07-261-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make `force_signal37_to_load_all_clients_of_firm` to privateRyuta Kamizono2016-07-261-4/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #25936 from prathamesh-sonpatki/bump-arelSantiago Pastorino2016-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bump Arel to fix few failing tests on Ruby 2.4 related to the Integer unifica...Prathamesh Sonpatki2016-07-241-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #25950 from jules2689/masterRafael França2016-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also yield in parameters for a nil content_mime_typeJulian Nadeau2016-07-251-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Whoops, forgot the changelog entry for the previous commitSean Griffin2016-07-251-0/+5
* | | | | | | | | | | Correct the behavior of virtual attributes on models loaded from the dbSean Griffin2016-07-256-12/+74
|/ / / / / / / / / /
* | | | | | | | | | systematic revision of =~ usage in AVXavier Noria2016-07-2511-28/+39
* | | | | | | | | | use \A and \z when you mean \A and \zXavier Noria2016-07-241-1/+1
* | | | | | | | | | adds missing requiresXavier Noria2016-07-2411-1/+14
* | | | | | | | | | systematic revision of =~ usage in AMoXavier Noria2016-07-244-7/+11
| |_|/ / / / / / / |/| | | | | | | |