aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
...
| * | [ActiveJob] TestCaseAbdelkader Boudih2014-09-021-1/+3
* | | Leave all our tests as order_dependent! for nowMatthew Draper2014-09-021-0/+4
|/ /
* | Add test to assert the right sanitizer vendor is being usedRafael Mendonça França2014-09-011-0/+41
* | Try with web-console masterRafael Mendonça França2014-09-011-1/+1
* | Use jquery-rails masterRafael Mendonça França2014-09-011-1/+1
* | Keep it closer to the original wording [ci skip]Godfrey Chan2014-08-311-1/+1
* | Since /console is an optional feature, mention <%= console %> instead.Rhett Sutphin2014-08-311-1/+1
|/
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2920-35/+93
|\
| * Expectations firstAkira Matsuda2014-08-284-9/+9
| * Reset RACK_ENV after modified in a test caseAkira Matsuda2014-08-281-0/+1
| * Rails.root should be a PathnameAkira Matsuda2014-08-281-1/+1
| * Fix spelling. [CI SKIP]Guo Xiang Tan2014-08-271-1/+1
| * fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-273-4/+23
| * 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
| * | Merge pull request #16604 from saarons/clean-remote-ip-middlewareJeremy Kemper2014-08-211-1/+15
| |\ \
| | * | Refactor ActionDispatch::RemoteIpSam Aarons2014-08-211-1/+15
| | |/
| * | 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-202-0/+2
| * 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 failing railties testsCarlos Antonio da Silva2014-08-191-2/+6
* 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-193-11/+23
* 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-196-126/+31
* Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelogGuillermo Iguaran2014-08-191-0/+7
|\
| * Mention web-console in 4.2 release notesGenadi Samokovarov2014-08-201-0/+7
* | 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-196-31/+130
|/
* 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-174-4/+80
|\
| * Add a `required` option to the model generatorSean Griffin2014-08-084-4/+80
* | Merge branch 'master' into loofahRafael Mendonça França2014-08-1710-46/+23
|\ \
| * \ Merge pull request #16481 from sgrif/sg-change-default-timestampsDavid Heinemeier Hansson2014-08-171-1/+1
| |\ \
| | * | Change the default `null` value for timestampsSean Griffin2014-08-121-1/+1
| * | | 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