aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-175-0/+15
* Default I18n.enforce_available_locales to trueCarlos Antonio da Silva2013-12-172-8/+48
* Fix indent on AS changelog [ci skip]Carlos Antonio da Silva2013-12-171-18/+18
* minor doc reword. Upgrade Rails itself not to Rails. [ci skip]Yves Senn2013-12-171-3/+3
* Merge pull request #13347 from jeremy/concerningJeremy Kemper2013-12-174-0/+219
|\
| * Introduce Module#concerningJeremy Kemper2013-12-174-0/+219
|/
* MySQL: remove the old-school 'packets out of order' messageJeremy Kemper2013-12-171-6/+0
* use `bin/spring` in release notes. [ci skip]Yves Senn2013-12-171-1/+1
* Merge pull request #13332 from rails/pixeltrix/mail_viewGuillermo Iguaran2013-12-1621-26/+765
|\
| * Add mailer previews feature based on mail_view gemAndrew White2013-12-1717-6/+736
| * Add an application controller for internal controllersAndrew White2013-12-173-18/+23
| * Fix method redefinition warningAndrew White2013-12-171-2/+6
|/
* Merge pull request #12873 from martinemde/fix-where-assoc-nilCarlos Antonio da Silva2013-12-163-3/+104
|\
| * Better support for `where()` conditions that use an association name.Martin Emde2013-12-163-3/+104
|/
* Remove the link for code.whytheluckystiff.netRafael Mendonça França2013-12-161-1/+1
* Merge pull request #13338 from shreve/patch-1Rafael Mendonça França2013-12-161-1/+1
|\
| * Fix url leak in application templates guideJacob Evan Shreve2013-12-161-1/+1
|/
* Merge pull request #13321 from mezis/fix-safebuffer-interpolation-masterJeremy Kemper2013-12-162-7/+37
|\
| * Fixes interpolation on SafeBufferJulien Letessier2013-12-142-7/+37
* | Fix missing closing rdoc tag [ci skip]Carlos Antonio da Silva2013-12-161-1/+1
* | Merge pull request #13328 from teohm/dbconsole_support_database_urlYves Senn2013-12-163-35/+76
|\ \
| * | fixed rails dbconsole to support ENV['DATABASE_URL'].Huiming Teo2013-12-163-35/+76
* | | Merge pull request #13333 from kia84/masterYves Senn2013-12-151-0/+1
|\ \ \
| * | | Added `absence` parameter to pluralization tableIvan2013-12-161-0/+1
|/ / /
* | | Merge pull request #13307 from akshay-vishnoi/typoRafael Mendonça França2013-12-154-6/+6
|\ \ \
| * | | Spelling and Grammar check [ci skip]Akshay Vishnoi2013-12-164-6/+6
* | | | Improve CHANGELOG entry with examples [ci skip]Rafael Mendonça França2013-12-151-0/+10
* | | | Merge pull request #13313 from ccutrer/temp-tablesRafael Mendonça França2013-12-158-17/+83
|\ \ \ \
| * | | | support creating temporary tables from queriesCody Cutrer2013-12-148-17/+83
* | | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2013-12-151-3/+3
* | | | | Merge pull request #13312 from arthurnn/fix_db_task_reqRafael Mendonça França2013-12-153-5/+13
|\ \ \ \ \
| * | | | | Regression test for load_structure and clone_structureArthur Neves2013-12-141-2/+4
| * | | | | db:test:clone and prepare must load environmentArthur Neves2013-12-142-3/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #13329 from robertomiranda/secret-token-docsGuillermo Iguaran2013-12-152-10/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update secret_key_base Docsrobertomiranda2013-12-152-10/+11
|/ / / /
* | | | Merge pull request #13181 from fluxusfrequency/patch-4Robin Dupret2013-12-141-221/+603
|\ \ \ \
| * | | | Word wrapping engines guide [ci skip]Ben Lewis2013-12-141-189/+568
| * | | | Clarification, grammar fixes, punctuation, and capitalization [ci skip]Ben Lewis2013-12-141-84/+87
* | | | | Merge pull request #13325 from kuldeepaggarwal/docs-updateGuillermo Iguaran2013-12-144-4/+4
|\ \ \ \ \
| * | | | | Improved documents [ci skip]Kuldeep Aggarwal2013-12-144-4/+4
|/ / / / /
* | | | | Merge pull request #13324 from fphilipe/fix-syntax-error-in-exampleRafael Mendonça França2013-12-141-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix syntax error in redirect_to examplePhilipe Fatio2013-12-141-1/+1
|/ / / /
* | | | Merge pull request #13316 from JuanitoFatas/working-with-jsGodfrey Chan2013-12-141-5/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve document: working with javascript in rails [ci skip].Juanito Fatas2013-12-141-5/+15
|/ / /
* | | Fix typo [ci skip]Rafael Mendonça França2013-12-131-1/+1
* | | Merge pull request #13298 from rails/secret_tokensGuillermo Iguaran2013-12-138-15/+79
|\ \ \
| * | | Add comment about secret_key_base in secrets.ymlGuillermo Iguaran2013-12-131-0/+12
| * | | Rename tokens.yml to secrets.ymlGuillermo Iguaran2013-12-125-6/+6
| * | | Add test for custom tokens stored in config/tokens.ymlGuillermo Iguaran2013-12-121-0/+13
| * | | Replace config.secret_key_base with secrets.secret_key_base in testGuillermo Iguaran2013-12-121-1/+1