aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #24543 from prathamesh-sonpatki/fix-ap-changelogRichard Schneeman2016-04-131-2/+2
|\ \ \ \ \
| * | | | | [ci skip] Remove extra `so` from the Action Pack CHANGELOGPrathamesh Sonpatki2016-04-141-2/+2
|/ / / / /
* | | | | Merge pull request #24533 from vipulnsward/nodoc-versionSean Griffin2016-04-131-1/+1
|\ \ \ \ \
| * | | | | :nodoc: version method.Vipul A M2016-04-131-1/+1
| |/ / / /
* | | | | Merge pull request #24525 from tomkadwill/action-mailer-base-docs2Vipul A M2016-04-141-3/+3
|\ \ \ \ \
| * | | | | Update ActionMailer base documentation [ci skip]Tom Kadwill2016-04-131-3/+3
* | | | | | Merge pull request #24539 from bogdan/diry-keyword-argsSean Griffin2016-04-131-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed bug introduced in #24519. Makes build green againBogdan Gusiev2016-04-131-1/+1
* | | | | | | Merge pull request #24536 from vipulnsward/ruby-2-upgradingRafael França2016-04-131-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add ruby 2.2.2+ version requirement for Rails 5 appsVipul A M2016-04-131-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #24519 from bogdan/diry-keyword-argsJeremy Daer2016-04-131-8/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use keyword arguments to cleanup without droping performanceBogdan Gusiev2016-04-131-8/+8
* | | | | | Properly serialize all JSON primitives in the AR JSON typeSean Griffin2016-04-134-14/+30
* | | | | | Remove unused variableRafael Mendonça França2016-04-131-1/+0
* | | | | | Remove time calculatiosn extensionRafael Mendonça França2016-04-131-0/+2
* | | | | | Merge pull request #24318 from bogdanvlviv/patch-1Rafael Mendonça França2016-04-122-1/+5
|\ \ \ \ \ \
| * | | | | | extension synonyms yml and yamlBogdan2016-03-272-1/+5
* | | | | | | Merge pull request #24524 from prathamesh-sonpatki/cablejs-for-channelsRafael França2016-04-123-0/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Generate `cable.js` file if does not exist when generating channelPrathamesh Sonpatki2016-04-123-0/+22
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #24515 from Sen-Zhang/attribute_changed_not_return_nilSean Griffin2016-04-122-3/+3
|\ \ \ \ \ \
| * | | | | | prevent 'attribute_changed?' from returning nilSen-Zhang2016-04-112-3/+3
| |/ / / / /
* | | | | | Merge pull request #24502 from ankit8898/freezing-dot-in-delimiter-helperRichard Schneeman2016-04-122-4/+6
|\ \ \ \ \ \
| * | | | | | Freezing couple of more string '0' & '.' and using the string appending to do...Ankit Gupta2016-04-111-2/+4
| * | | | | | Freezing the dots as they are causing extra string initialization on every it...Ankit Gupta2016-04-102-2/+2
* | | | | | | copy edits some comments [ci skip]Xavier Noria2016-04-121-8/+5
* | | | | | | Merge pull request #24494 from vipulnsward/guides-changelog-passYves Senn2016-04-121-8/+15
|\ \ \ \ \ \ \
| * | | | | | | - Add changelog for new guide: AC overview from https://github.com/rails/rail...Vipul A M2016-04-101-0/+5
| * | | | | | | - Fixed changelog related to i18 key changes. Added authorVipul A M2016-04-101-8/+10
* | | | | | | | Merge pull request #24523 from BlakeMesdag/as-max_time-fix-edgesXavier Noria2016-04-122-7/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | No more need for an early returnBlake Mesdag2016-04-121-2/+0
| * | | | | | | | More readable versionBlake Mesdag2016-04-121-13/+10
| * | | | | | | | Handle max_time edge cases for epoch times and add testBlake Mesdag2016-04-122-3/+29
* | | | | | | | | Allow symbols using "dot notation" to be passed to whereSean Griffin2016-04-124-7/+12
|/ / / / / / / /
* | | | | | | | Merge pull request #24520 from BlakeMesdag/activesupport-fileupdate-checker-m...Xavier Noria2016-04-121-1/+17
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use Time#compare_without_coercion for super speedBlake Mesdag2016-04-121-1/+6
| * | | | | | | Use a single memoized loop to find max mtime in ActiveSupport::FileUpdateChec...Blake Mesdag2016-04-121-1/+12
|/ / / / / / /
* | | | | | | Merge pull request #24495 from vipulnsward/rails-changelog-passSantiago Pastorino2016-04-111-18/+18
|\ \ \ \ \ \ \
| * | | | | | | - Fence some commands, options, gems, etc. with quotesVipul A M2016-04-101-18/+18
| |/ / / / / /
* | | | | | | Merge pull request #24490 from prathamesh-sonpatki/add-config-to-deprecation-...Santiago Pastorino2016-04-111-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Add `config` to the deprecation warnings of deprecated config optionsPrathamesh Sonpatki2016-04-101-3/+3
* | | | | | | | Merge pull request #24511 from lihanli/activemodel-dirty-attribute-changedJeremy Daer2016-04-111-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | set default parameter to nil to speed up attribute_changed?Lihan Li2016-04-111-3/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #24504 from nickmalcolm/masterVipul A M2016-04-121-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] This modifies the HTTP Token authentication example's `authenticate...Nick Malcolm2016-04-121-1/+6
* | | | | | | | | Merge pull request #24492 from vipulnsward/pass-over-warningsJeremy Daer2016-04-1114-20/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass over all Rails 5 warnings, to make sure:Vipul A M2016-04-1214-20/+19
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #24508 from alexmirk/masterVipul A M2016-04-121-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improved ActionView flows.rb documention [ci skip]Alex Mirkhaydarov2016-04-111-5/+4
|/ / / / / / / / /
* | | / / / / / / edit pass over the RDoc of Rails::Railtie [ci skip]Xavier Noria2016-04-111-36/+36
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | remove explicit curlies for hash argumentXavier Noria2016-04-111-2/+2