aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
* /rails/info/routes path shows routing informationschneems2012-05-247-8/+72
| | | | Will show similar contents to the output of `$ rake routes` in the browser in development. This speeds the time required to generate routes, since the application is already initialized.
* Fixed backward incompatibility for engines.Philip Arndt2012-05-241-1/+1
| | | | | | | | | | | | - Many engines rely on being able to join directories to the Rails root: Rails.root.join('somedir') - This was now impossible because Rails.root returned a String: NoMethodError: undefined method `join' for "/code/myrailsapp":String - This was broken in 4001835db00ce44cb75bca33ec02cd76b8ccc790
* use File.join rather than depend on PathnameAaron Patterson2012-05-231-1/+1
|
* Revert "require the constants we use. ensure that root always returns a ↵Aaron Patterson2012-05-231-2/+1
| | | | | | Pathname" This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6.
* require the constants we use. ensure that root always returns a PathnameAaron Patterson2012-05-231-1/+2
|
* removing more pathnameismsAaron Patterson2012-05-232-6/+4
|
* use File.join to decrease dependencies on PathnameAaron Patterson2012-05-231-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-231-2/+1
|\
| * Revert "Remove blank trailing comments"Vijay Dev2012-05-2310-0/+23
| | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
| * Remove obsolete comment from generator gem methodAlexey Vakhov2012-05-221-2/+1
| | | | | | | | | | This comment about :env option for gem method was actual for rails 2.3 without bundler. Now bundler uses grups for this goal.
| * Remove blank trailing commentsHenrik Hodne2012-05-2010-23/+0
| | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
* | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-231-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 12:20:26 +0000