aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6708 from ↵José Valim2012-06-111-1/+1
|\ | | | | | | | | amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted ignore .gitignore'd files in rake test:uncomitted
| * ignore .gitignore'd files in rake test:uncomittedAkira Matsuda2012-06-121-1/+1
| |
* | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+12
|\ \ | |/ |/| Fix: 'rake rails:templates:copy' doesn't work
| * Added a testcase for #6690.kennyj2012-06-121-0/+11
| |
| * fix stylesheet template dirSugino Yasuhiro2012-06-091-1/+1
| |
* | Merge pull request #6692 from schneems/schneems/something-went-wrongJosé Valim2012-06-102-0/+2
|\ \ | | | | | | Add Prompt to 404 & 500 Pages to Check Logs in Production
| * | add prompt to 404 & 500 pages to check logsschneems2012-06-092-0/+2
| |/ | | | | When new programmers push their code to a production server and receive an error they often don't know to check the logs, this simple reminder will help. Most professional applications have custom error pages so this change shouldn't affect them. The wording of the message should not confuse non-developer visitors.
* | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-102-1/+3
| |
* | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-103-0/+20
|\ \ | |/ |/| Notify A User they Have Pending Migrations
| * test errors for pending migrationsschneems2012-06-091-0/+15
| | | | | | App should raise error on page_load
| * raise error for pending migration schneems2012-06-092-0/+5
| | | | | | can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications.
* | Fix tests, active_authorizer shouldn't include blank valuesPiotr Sarnacki2012-06-091-1/+1
| | | | | | | | Fix for a test failing after: 00ff0a6776
* | Merge pull request #6681 from arunagw/plugin_gen_fixRafael Mendonça França2012-06-082-3/+9
|\ \ | | | | | | Plugin gen fix
| * | We should not include engine.rake file into rakeArun Agrawal2012-06-082-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673
| * | Removed protected as we already doing it above.Arun Agrawal2012-06-081-2/+0
| | |
* | | Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-082-0/+10
|/ / | | | | | | (closes #6672)
* | Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-071-4/+4
|\ \ | | | | | | change AMS::JSON.include_root_in_json default value to false
| * | change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Update `include_root_in_json` default value to false for default value to false for `ActiveModel::Serializers::JSON`. * Remove unnecessary change to include_root_in_json option in wrap_parameters template. * Update `as_json` documentation. * Fix JSONSerialization tests. Problem: It's confusing that AM serializers behave differently from AR, even when AR objects include AM serializers module. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"person"=>{"name"=>"Francesco", "age"=>22}} # root is included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => true # different default values for include_root_in_json Proposal: Change the default value of AM serializers to false, update the misleading documentation and remove unnecessary change to false of include_root_in_json option with AR objects. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"name"=>"Francesco", "age"=>22} # root is not included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => false # same behaviour, more consistent Fixes #6578.
* | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
| | |
* | | stop `to_s`ing method namesAkira Matsuda2012-06-061-3/+1
| | | | | | | | | | | | Module#methods are Symbols in Ruby >= 1.9
* | | Make method name consistent with existing methodsAndrew White2012-06-062-4/+4
| | |
* | | Fixed the application_controller require_dependency path generated by the ↵Fred Wu2012-06-063-6/+9
| | | | | | | | | | | | app generator
* | | Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assertJosé Valim2012-06-051-17/+24
|\ \ \ | | | | | | | | bundle exec rake assets:precompile shouldn't fail quietly.
| * | | bundle exec rake assets:precompile shouldn't fail quietly.John Yani2012-06-051-17/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | If JavaScript runtime is not installed, execjs fails with error quietly, while tests continue to run. This should not happen since it causes tests to fail for unknown reason (#6621). This commit assures that if JavaScript runtime is not installed, an assertion is raised.
* / / Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' commandFred Wu2012-06-052-0/+41
|/ /
* | remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
| |
* | Revert "Only include Rake::DSL if it's defined."Akira Matsuda2012-06-011-1/+1
| | | | | | | | | | | | This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7. Reason: Ruby 1.9.3 is shipped with Rake > 0.9
* | Rake::DSL should always be availableJeremy Kemper2012-05-311-1/+1
| |
* | Explicitly require rake so its DSL is availableJeremy Kemper2012-05-311-0/+1
| |
* | Add code statistics for Javascript andArun Agrawal2012-05-312-2/+10
| | | | | | | | | | | | | | CoffeeScript files to `rake stats` task Orignal PR was #2270 Thanks to @nfm
* | Set RACK_ENV to nil in the dbconsole testRafael Mendonça França2012-05-301-0/+1
| | | | | | | | This will fix the travis-ci build
* | Fix app_generator_test with the changes introduced atRafael Mendonça França2012-05-301-1/+1
| | | | | | | | f4d7af67ffc90f2542afa50c7579fc83ea4f45f2
* | Changed symbol platform to platforms for the commented out call to gem ↵Martin O'Connor2012-05-301-1/+1
| | | | | | | | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
* | Remove support for rails server RAILS_ENV=env-nameSam Oliver2012-05-302-7/+2
| |
* | Fix various bugs with console arguments.Sam Oliver2012-05-305-125/+180
|/ | | | Allow hyphens in environment names again.
* remove unused route reloading codeschneems2012-05-301-2/+0
| | | Since the environment is initialized each time rake is run, routes don't need to be re-loaded. https://github.com/rails/rails/pull/6461#r869953
* Add a changelog entry about runner hook.kennyj2012-05-311-0/+2
|
* Unused variable warning removed.Arun Agrawal2012-05-301-1/+1
|
* More assert_match warnings fixed.Arun Agrawal2012-05-304-12/+12
|
* Warnings removed for "assert_match /".Arun Agrawal2012-05-301-20/+20
|
* Add support runner hook.kennyj2012-05-296-0/+53
|
* Add a testcase for #5847.kennyj2012-05-291-0/+23
|
* update Gemfile template to 1.9 hash syntaxFrancesco Rodriguez2012-05-291-1/+1
|
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-272-1/+5
| | | | | | | | | | | | | | | railites_order method, introduced in 40b19e0, had a bug that was causing loading application instance twice in initializers if railties_order already included application instance. So for example railties_order = [Foo::Engine, :main_app, Bar::Engine] would result in such railties array: [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine] In order to fix it, we need to check for existence of application in both railties_order and railties arrays.
* Fixes build 4008.1Waseem Ahmad2012-05-251-2/+2
| | | | | | | | This fixex build 4008.1[1] because of the changes made in 4001835db00ce44cb75bca33ec02cd76b8ccc790 [1] http://travis-ci.org/#!/rails/rails/jobs/1429671
* Merge pull request #6481 from schneems/schneems/sextant-routesRafael Mendonça França2012-05-241-9/+0
|\ | | | | Remove Unnecessary Test from route_inspect_test
| * remove unnecessary test from route_inspect_testschneems2012-05-241-9/+0
| |
* | do not set the ENGINE_PATH to nilAaron Patterson2012-05-241-1/+1
| |
* | `name` should be public.Aaron Patterson2012-05-241-12/+12
|/
* Rails::InfoController tests passingschneems2012-05-243-6/+32
| | | | This includes new tests for /rails/info/routes
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 16:20:28 +0000