aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Persist user provided default values, even if unchangedSean Griffin2015-05-284-27/+21
* Allow proc defaults with the Attributes APISean Griffin2015-05-283-1/+36
* Merge pull request #20017 from eliotsykes/configurable-static-index-filenameRafael Mendonça França2015-05-2812-8/+65
|\
| * config.static_index configures directory index "index.html" filenameEliot Sykes2015-05-2812-8/+65
* | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasksRafael Mendonça França2015-05-288-62/+2
|\ \
| * | Remove unused package tasksArun Agrawal2015-05-288-62/+2
| |/
* | Merge pull request #20344 from jcockhren/fix_docs_presence_validationLauro Caetano2015-05-281-1/+0
|\ \
| * | removed erroneous line. Corrected presence validation example.Jurnell Cockhren2015-05-281-1/+0
|/ /
* | Merge pull request #20313 from s3ymd/masterArthur Nogueira Neves2015-05-281-1/+1
|\ \
| * | [ci skip] Fix block parameter of assert_no_differenceHiromichi Yamada2015-05-281-1/+1
* | | Merge pull request #20336 from vngrs/deprecate_nothing_option_for_render_methodSantiago Pastorino2015-05-2813-49/+38
|\ \ \ | |/ / |/| |
| * | Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-2813-49/+38
| |/
* | Merge pull request #20332 from henders/shender/changelog_reload_creditArun Agrawal2015-05-281-2/+2
|\ \ | |/ |/|
| * Give credit to extra contributor for Base.reload fixShane Hender2015-05-281-2/+2
|/
* Merge pull request #20196 from huoxito/preload-association-and-mergesRafael Mendonça França2015-05-282-2/+50
|\
| * Properly append preload / includes args on MergerWashington Luiz2015-05-282-2/+50
* | Merge pull request #20263 from arunagw/aa-remove-custom-lines-actionviewRafael Mendonça França2015-05-281-21/+3
|\ \
| * | Remove custom `lines` and use `/tools/line_statistics`Arun Agrawal2015-05-221-21/+3
* | | Merge pull request #20041 from akshay-vishnoi/sqlite_collationRafael Mendonça França2015-05-286-9/+139
|\ \ \
| * | | Add collation support for string and text columns in SQLite3Akshay Vishnoi2015-05-286-9/+139
* | | | Add test to 57daaefRafael Mendonça França2015-05-281-1/+1
* | | | Allow Relation#compact using delegationJordan Raine2015-05-281-1/+1
|/ / /
* | | Merge pull request #20329 from EduardoBautista/json-api-supportRafael Mendonça França2015-05-271-1/+1
|\ \ \
| * | | Add application/vnd.api+json alias to the JSON MIME Type.Eduardo Bautista2015-05-271-1/+1
| | |/ | |/|
* | | Merge pull request #20171 from georgeclaghorn/enums-in-fixturesRafael Mendonça França2015-05-276-32/+64
|\ \ \
| * | | Resolve enums in test fixturesGeorge Claghorn2015-05-276-32/+64
* | | | Merge pull request #19886 from henders/henders/reload_wipe_query_cacheRafael Mendonça França2015-05-273-1/+34
|\ \ \ \
| * | | | Cause ActiveRecord::Base::reload to also ignore the QueryCache.Shane Hender2015-04-282-1/+30
* | | | | Merge pull request #17654 from kamipo/strict_mode_explicitlyRafael Mendonça França2015-05-273-2/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | If specify `strict: :default` explicitly, do not set sql_mode.Ryuta Kamizono2015-05-263-2/+22
* | | | | Merge pull request #20269 from wojobucco/masterRafael Mendonça França2015-05-273-4/+9
|\ \ \ \ \
| * | | | | Changed mysqldump to include sprocs and functionsJonathan Worek2015-05-222-4/+5
* | | | | | Merge pull request #20326 from hderms/dh/fix_task_bugRafael Mendonça França2015-05-272-16/+66
|\ \ \ \ \ \
| * | | | | | add fixed fileDermot Haughey2015-05-272-16/+66
* | | | | | | :bomb: Fix another leftoverRafael Mendonça França2015-05-271-1/+1
* | | | | | | Fix file nameRafael Mendonça França2015-05-271-1/+1
* | | | | | | Merge pull request #19808 from byroot/action-parameterRafael Mendonça França2015-05-272-15/+32
|\ \ \ \ \ \ \
| * | | | | | | Allow to parameters named `action` or `controller` from AC::TestCase helpersJean Boussier2015-04-182-15/+32
* | | | | | | | Merge pull request #19867 from radar/rename-app-rails-loaderRafael Mendonça França2015-05-274-14/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove redundant 'Rails' from Rails::AppRailsLoader constantRyan Bigg2015-05-214-14/+14
* | | | | | | | | Merge pull request #20327 from yoongkang/ajaxZachary Scott2015-05-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | [ci skip] Replace dead link about HttpOnly cookies.Yoong Kang Lim2015-05-281-1/+1
* | | | | | | | | Merge pull request #20316 from vngrs/add_assertion_for_get_method_into_reques...Rafael Mendonça França2015-05-271-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add assertion for get? method into test casesMehmet Emin İNAÇ2015-05-271-0/+1
* | | | | | | | | | Merge pull request #20321 from vngrs/fix_indentation_warningRafael Mendonça França2015-05-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix indentation warning on active_support ordered_optionsMehmet Emin İNAÇ2015-05-271-1/+1
* | | | | | | | | | | Merge pull request #20323 from jakegavin/initialization-guide-updateClaudio B.2015-05-271-3/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unnecessary reference to example Blog app [ci skip]Jake Gavin2015-05-271-3/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #20319 from kassio/masterRafael Mendonça França2015-05-271-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove web-console and spring from test group on default Gemfile.Kassio Borges2015-05-271-2/+4
|/ / / / / / / / / /