aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove circular join references in join_dependencyTakashi Kokubun2016-07-282-1/+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
* | | Merge pull request #25928 from mechanicles/info-for-cache-fetch-blockप्रथमेश Sonpatki2016-07-241-1/+1
|\ \ \
| * | | Proper description for `Rails.cache.fetch` [ci skip]Santosh Wadghule2016-07-241-1/+1
* | | | removes spurious lineXavier Noria2016-07-241-1/+0
* | | | give some love to this test fileXavier Noria2016-07-231-151/+155
* | | | systematic revision of =~ usage in ARXavier Noria2016-07-2321-29/+34
| |/ / |/| |
* | | Merge pull request #25908 from mechanicles/derives-fromKasper Timm Hansen2016-07-232-8/+8
|\ \ \
| * | | Explain meaning of the code very well and Remove confusion. [ci skip]Santosh Wadghule2016-07-232-8/+8
| |/ /
* | | Merge pull request #25914 from jmccartie/jm/not_inRafael França2016-07-224-0/+81
|\ \ \
| * | | Adds `not_in?` onto ObjectJon McCartie2016-07-214-0/+81
* | | | revises a regexpXavier Noria2016-07-221-1/+1
* | | | systematic revision of =~ usage in ASXavier Noria2016-07-2217-29/+43
* | | | adds require for Regexp#match?Xavier Noria2016-07-221-0/+2
* | | | revises styleXavier Noria2016-07-221-1/+1
* | | | the infamous typo only seen in GitHub's diff [ci skip]Xavier Noria2016-07-221-1/+1
|/ / /
* | | performance boost for String#blank? in Ruby 2.4Xavier Noria2016-07-221-1/+1
* | | define Range#match? if Ruby < 2.4Xavier Noria2016-07-224-2/+54
* | | Allow MessageEncryptor to take advantage of authenticated encryption modesBart de Water2016-07-213-4/+64
* | | Merge pull request #25911 from juno/fix-comment-indentXavier Noria2016-07-211-3/+3
|\ \ \
| * | | Fix incorrect indentation in method comment [ci skip]Junya Ogura2016-07-211-3/+3
|/ / /