aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2911-23/+48
|\
| * fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-271-4/+6
| * show stats for app/jobsyuuji.yaginuma2014-08-241-1/+2
| * [ActiveJob] Add hook for test_framework and test templatesAbdelkader Boudih2014-08-222-0/+22
| * Merge pull request #16622 from matthewd/default-debugMatthew Draper2014-08-232-3/+3
| |\
| | * Don't fight against ourselves for the default log levelMatthew Draper2014-08-222-3/+3
| * | fix grammar [ci skip]Vijay Dev2014-08-221-1/+1
| * | fix server names [ci skip]Vijay Dev2014-08-221-1/+1
| |/
| * Make text consistent in help text of rails server and console commands.Vijay Dev2014-08-212-13/+13
| * Remove timestamp type from generator usageRafael Mendonça França2014-08-201-1/+0
| * Require ActiveJob in case a skip_xxx option is givenslainer682014-08-201-0/+1
| * remove end-of-line spacing in development.rb, production.rbNick Sinenko2014-08-202-2/+2
* | Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Fix blank link on config/application.rb app template [ci skip]Carlos Antonio da Silva2014-08-191-1/+1
* Fix setting simple values to the new config.xCarlos Antonio da Silva2014-08-191-4/+10
* Point to right sass-rails versionRafael Mendonça França2014-08-191-1/+1
* Use web-console 2.0.0.beta2 on new appsGuillermo Iguaran2014-08-191-1/+1
* Revert "Improve custom configuration"Rafael Mendonça França2014-08-192-37/+15
* We always get the value so no need to check nil or HashRafael Mendonça França2014-08-191-6/+2
* Use released rails-html-sanitizerRafael Mendonça França2014-08-191-1/+1
* Merge pull request #16563 from arthurnn/add_ar_raise_trans_optionRafael Mendonça França2014-08-191-0/+5
|\
| * Add default .raise_in_transactional_callbacks option to templateArthur Neves2014-08-191-0/+5
* | loofah require dependecy is not needed anymoreRafael Mendonça França2014-08-191-2/+0
* | Improve custom configurationRafael Mendonça França2014-08-192-15/+41
|/
* Rack is released tooRafael Mendonça França2014-08-181-4/+2
* No need to point to arel and i18n master anymoreRafael Mendonça França2014-08-181-6/+2
* Fix rails-html_sanitizer in Gemfile templateJon Atack2014-08-181-1/+1
* Merge pull request #16062 from sgrif/sg-required-generatorsRafael Mendonça França2014-08-171-4/+20
|\
| * Add a `required` option to the model generatorSean Griffin2014-08-081-4/+20
* | Merge branch 'master' into loofahRafael Mendonça França2014-08-177-41/+12
|\ \
| * \ Merge pull request #16294 from bf4/code_toolsRafael Mendonça França2014-08-171-35/+0
| |\ \
| | * | Remove unused, broken, legacy ruby-prof extension from 2005Benjamin Fleischer2014-07-251-35/+0
| * | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-173-1/+9
| |\ \ \
| | * \ \ Merge pull request #16485 from seuros/activejobDavid Heinemeier Hansson2014-08-172-0/+8
| | |\ \ \
| | | * | | Added docs for AJ::Callbacks; Added AJ to docs build mapCristian Bica2014-08-161-0/+7
| | | * | | Remove activejob integration testsAbdelkader Boudih2014-08-121-0/+1
| | * | | | Lock web-console to 2.0.0.beta1 for the first 4.2 betaGenadi Samokovarov2014-08-181-1/+1
| * | | | | Dont encourage people to run without autoflush in productionDavid Heinemeier Hansson2014-08-171-3/+0
| |/ / / /
| * | | | Merge pull request #16467 from strzalek/cookies-digest-config-option2Godfrey Chan2014-08-171-1/+2
| |\ \ \ \
| | * | | | Add config option for cookies digestŁukasz Strzałkowski2014-08-121-1/+2
| | | |_|/ | | |/| |
| * | | | s/Dont'/Don't/Akira Matsuda2014-08-151-1/+1
| | |/ / | |/| |
* | | | Use the release gems and point application gemfile to right loofahRafael Mendonça França2014-08-171-1/+3
* | | | Prepare for partial release.Kasper Timm Hansen2014-08-171-0/+3
|/ / /
* | | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-081-2/+1
* | | Merge pull request #16434 from strzalek/cookies-digest-config-optionSantiago Pastorino2014-08-081-1/+2
|\ \ \
| * | | Return preconfigured AS::MessageVerifierŁukasz Strzałkowski2014-08-081-1/+1
| * | | Add config option for cookies digestŁukasz Strzałkowski2014-08-081-0/+1
| |/ /
* | | save a hash allocation per request.Aaron Patterson2014-08-081-1/+1
* | | Fixes test for Gemfile entry changesArun Agrawal2014-08-082-2/+2
|/ /
* | Pull spring gem entry into the Gemfile template instead of gemfile_entries so...David Heinemeier Hansson2014-08-072-10/+12