aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
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-111-1/+1
|\ \ | |/ |/| Fix: 'rake rails:templates:copy' doesn't work
| * 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.
* | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-102-0/+5
|\ \ | |/ |/| Notify A User they Have Pending Migrations
| * 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.
* | Merge pull request #6681 from arunagw/plugin_gen_fixRafael Mendonça França2012-06-081-1/+1
|\ \ | | | | | | Plugin gen fix
| * | We should not include engine.rake file into rakeArun Agrawal2012-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-081-0/+2
|/ / | | | | | | (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
| | |
* | | 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-062-5/+6
| | | | | | | | | | | | app generator
* | | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' commandFred Wu2012-06-051-0/+15
|/ /
* | 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
* | 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-301-5/+0
| |
* | Fix various bugs with console arguments.Sam Oliver2012-05-303-86/+109
|/ | | | 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 support runner hook.kennyj2012-05-294-0/+27
|
* update Gemfile template to 1.9 hash syntaxFrancesco Rodriguez2012-05-291-1/+1
|
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-271-1/+1
| | | | | | | | | | | | | | | 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.
* do not set the ENGINE_PATH to nilAaron Patterson2012-05-241-1/+1
|
* `name` should be public.Aaron Patterson2012-05-241-12/+12
|
* /rails/info/routes path shows routing informationschneems2012-05-246-8/+70
| | | | 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-239-0/+22
| | | | | | | | | | | | | | | | | | | | 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-209-22/+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.
* | I guess we have to return a pathname object. o_OAaron Patterson2012-05-221-1/+1
| |
* | use File.realpath and avoid making Pathname objectsAaron Patterson2012-05-221-2/+1
| |
* | use RUBY_PLATFORM in case of cross compiled rubyAaron Patterson2012-05-221-1/+1
| |
* | initialize instance variablesAaron Patterson2012-05-221-2/+6
| |
* | initialize our instance variablesAaron Patterson2012-05-221-2/+14
| |
* | Move root method at TOP of routes fileGaurish Sharma2012-05-221-3/+4
| | | | | | | | | | | | | | | | Made the change as per the following text in routing guide:- "You should put the root route at the top of the file, because it is the most popular route and should be matched first." However, if root is best left at bottom. We will change to fix that text
* | Use new hash syntax for generators gem methodAlexey Vakhov2012-05-222-2/+2
| | | | | | | | | | | | The Gemfile of new application uses ruby 1.9 hashes. Gem method of generators should use them too. It prevents from mixing two kinds of syntax in one file.
* | Use require_dependency in generated controllersPiotr Sarnacki2012-05-222-2/+2
| | | | | | | | | | | | | | Using require in development mode will prevent required files from reloading, even if they're changed. In order to keep namespaced application_controller reloadable, we need to use require_dependency instead of require.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:08:02 +0000