aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17803 from sadfuzzy/patch-2Abdelkader Boudih2014-11-271-1/+3
| | | | | | Update cookies.rb Conflicts: actionpack/lib/action_dispatch/middleware/cookies.rb
* Merge pull request #17802 from aar0nTw/remove-dependent-with-through-noteRafael Mendonça França2014-11-271-2/+0
|\ | | | | [ci skip] Remove outdate note of :dependent in guide
| * [ci skip] Remove outdate note of :dependentAaron Huang2014-11-281-2/+0
|/
* Merge pull request #17801 from jonatack/patch-8Rafael Mendonça França2014-11-271-2/+2
|\ | | | | Clarification follow-up to e2cce6c [ci skip]
| * Follow-up to e2cce6cJon Atack2014-11-271-2/+2
|/ | | [skip ci]
* Fix CHANGELOG typo introduced in e2cce6cd [ci skip]Zachary Scott2014-11-271-1/+1
|
* Merge pull request #17800 from jonatack/patch-8Zachary Scott2014-11-271-22/+21
|\ | | | | Action Mailer change log pass [ci skip]
| * Action Mailer change log passJon Atack2014-11-271-22/+21
| | | | | | [skip ci]
* | Update the StatementCache documentationRafael Mendonça França2014-11-271-4/+15
|/
* StatementCache is private APIRafael Mendonça França2014-11-271-6/+6
| | | | It should not be used in applications
* updates some pointers in the guides welcome section [ci skip]Xavier Noria2014-11-271-1/+1
|
* rails -> bin/rails in index.htmlXavier Noria2014-11-271-1/+1
|
* removes double mention of deliver_nowXavier Noria2014-11-271-4/+0
|
* edits in the release notes for 4.2Xavier Noria2014-11-271-12/+22
|
* Merge pull request #17796 from leafac/fix-formatYves Senn2014-11-271-1/+9
|\ | | | | | | Fix format "Form Helpers" guide
| * Fix format "Form Helpers" guideLeandro Facchinetti2014-11-261-1/+1
| | | | | | | | The `"_tag"` was interpreted as the start of a italics.
* | Merge pull request #17794 from zavan/fix-typoGodfrey Chan2014-11-261-1/+1
|\ \ | | | | | | Fix typo in Rails 4.2 release notes
| * | Fix typo in Rails 4.2 release notesFelipe Zavan2014-11-271-1/+1
|/ /
* | pass over the release notesXavier Noria2014-11-271-104/+118
| |
* | Test against rack masterRafael Mendonça França2014-11-262-2/+4
| |
* | Merge pull request #17691 from nickveys/from-json-docsRafael Mendonça França2014-11-261-4/+4
|\ \ | | | | | | Documentation regression in JSON#from_json
| * | Fixing documentation in JSON#from_jsonNick Veys2014-11-201-4/+4
| | | | | | | | | | | | | | | Commit d67b289 introduced a tiny regression in the docs for #from_json, true needs to be included when the root node is present.
* | | Merge pull request #17186 from tgxworld/header_authentication_tokenMatthew Draper2014-11-273-4/+37
|\ \ \ | | | | | | | | | | | | Allow authentication header to not have to specify 'token=' key.
| * | | Allow authentication header to not have to specify 'token=' key.Guo Xiang Tan2014-10-102-4/+30
| | | | | | | | | | | | | | | | Fixes: https://github.com/rails/rails/issues/17108.
* | | | Merge pull request #17786 from recursive-madman/activerecord-errors-codestyleRafael Mendonça França2014-11-262-3/+6
|\ \ \ \ | | | | | | | | | | Code style changes for various activerecord errors
| * | | | various error classes: added newlines & removed :nodoc: flag from public ↵Recursive Madman2014-11-262-3/+6
| | | | | | | | | | | | | | | | | | | | attribute.
* | | | | Merge pull request #17761 from pschrammel/masterYves Senn2014-11-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | be more general with adapter name
| * | | | be more general with adapter namePeter Schrammel2014-11-251-1/+1
| | | | |
* | | | | Merge pull request #17674 from recursive-madman/activerecord-error-improvementRafael Mendonça França2014-11-263-4/+25
|\ \ \ \ \ | | | | | | | | | | | | Add #record attribute to RecordNotFound and RecordDestroyed exceptions.
| * | | | | Add #record attribute to RecordNotFound and RecordDestroyed exceptions.Recursive Madman2014-11-263-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | This allows these exceptions to be handled generically in conjunction with RecordInvalid.
* | | | | | Merge pull request #17782 from cheba/engine-root-masterRafael Mendonça França2014-11-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use absolute_path of caller_locations to infer engine root
| * | | | | | Use absolute_path of caller_locations to infer engine rootAlexander Mankuta2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to documentation `path` only returns file names. On MRI it's not the case but it's likely a bug in MRI.
* | | | | | | Merge pull request #17781 from jonatack/patch-8Rafael Mendonça França2014-11-261-38/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Active Record change log pass [skip ci]
| * | | | | | | Active Record change log pass [skip ci]Jon Atack2014-11-261-38/+40
| |/ / / / / /
* | | | | | | Merge pull request #17785 from jipumarino/dbconsole-for-sqlserverRafael Mendonça França2014-11-261-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Provide support for SQL Server connections with dbconsole using sqsh
| * | | | | | | Provide support for SQL Server connections with dbconsole using sqshJuan Ignacio Pumarino2014-11-261-0/+15
|/ / / / / / /
* | | | | | | Merge pull request #17784 from bruno-/refactor-nested-ifsRafael Mendonça França2014-11-261-5/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Refactor nested if
| * | | | | | Refactor nested ifBruno Sutic2014-11-261-5/+3
|/ / / / / /
* | | | | | Merge pull request #17780 from arcz/patch-1José Valim2014-11-261-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove extra empty line
| * | | | | | Remove extra empty lineArtur Cygan2014-11-261-1/+0
|/ / / / / /
* | | | | | :scissors:Rafael Mendonça França2014-11-261-1/+1
| | | | | |
* | | | | | Merge pull request #17779 from dilpreet92/server_locationRafael Mendonça França2014-11-261-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Getting the location of the server
| * | | | | | getting the location of the serverdilpreet922014-11-261-2/+2
|/ / / / / /
* | | | | | Clarify where result goes, and supported formats of generate task.Zachary Scott2014-11-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Use jquery-rails 4.0.0Rafael Mendonça França2014-11-252-9/+3
| | | | | |
* | | | | | Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1Sean Griffin2014-11-252-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use web_console 2.0 for 4.2.0.rc1 release
| * | | | | | Use web_console 2.0 for 4.2.0.rc1 releaseGenadi Samokovarov2014-11-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one replaces the notable web-console mentions in guide and the default Gemfile.
* | | | | | | Merge pull request #17728 from jcutrell/jcutrell/docs-to_session_value-for-prRafael Mendonça França2014-11-251-3/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value
| * | | | | | | adding nodoc to private methodsJonathan Cutrell2014-11-231-2/+2
| | | | | | | |
| * | | | | | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_valueJonathan Cutrell2014-11-231-1/+4
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 09:22:47 +0000