aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Removed unused deprecation requires.Paul Nikitochkin2013-07-034-5/+0
|
* Merge pull request #11280 from arunagw/added-missing-changelog-entryYves Senn2013-07-031-0/+4
|\ | | | | Added missing CHANGELOG from PR #11279 [ci skip]
| * Added missing CHANGELOG from PR #11279 [ci skip]Arun Agrawal2013-07-031-0/+4
| |
* | Removed deprecated threadsafe!Paul Nikitochkin2013-07-031-10/+0
|/
* Merge pull request #11272 from vipulnsward/generator_updateRafael Mendonça França2013-07-032-6/+5
|\ | | | | Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attribute`
| * Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` inVipul A M2013-07-032-6/+5
| | | | | | | | favor of `ActiveRecord::Generators::ActiveModel#update`
* | Fix ruby patch level example in rails docs regarding info page [ci skip]Carlos Antonio da Silva2013-07-031-1/+1
|/ | | | Thanks @egilburg.
* Add patch level to Ruby version informationTyler Brock2013-07-031-2/+4
| | | | | Given the recent security related patches to ruby and rails it is more important than ever to know what patch level you are running.
* Merge pull request #10565 from prathamesh-sonpatki/rake-dbCarlos Antonio da Silva2013-07-021-1/+1
|\ | | | | Improved grammar and replaced 'dbs' slang with 'databases'
| * Improved grammar and replaced 'dbs' slang with 'databases'Prathamesh Sonpatki2013-06-271-1/+1
| |
* | Merge pull request #11134 from wangjohn/object_orienting_testing_rake_fileCarlos Antonio da Silva2013-07-022-15/+45
|\ \ | | | | | | Making the rake file for tests easier to read.
| * | Making the rake file for tests easier to read.wangjohn2013-06-252-15/+45
| | | | | | | | | | | | | | | I'm defining a new class which modularizes how the `rake test` tasks are defined and invoked.
* | | Remove deprecated `config.whiny_nils`Vipul A M2013-07-022-3/+4
| | |
* | | Use block instead passing as argumentRafael Mendonça França2013-07-021-1/+1
| | |
* | | Merge pull request #11220 from aditya-kapoor/add-concernCarlos Antonio da Silva2013-07-011-4/+3
|\ \ \ | | | | | | | | Change Rails Migration generator module to use AS::Concern
| * | | Using ActiveSupport::Concern instead of plain regular Ruby hooks in ↵aditya-kapoor2013-07-011-4/+3
| | | | | | | | | | | | | | | | railties/lib/rails/generators/migration.rb file
* | | | Merge pull request #11203 from schneems/schneems/plugin_new-pluginRafael Mendonça França2013-07-0135-16/+20
|\ \ \ \ | |/ / / |/| | | s/plugin_new/plugin
| * | | s/plugin_new/pluginschneems2013-06-3035-16/+20
| | | | | | | | | | | | | | | | | | | | There are historical reasons that the `plugin` command was `plugin_new`, now those are no longer applicable, we should remove the naming edge case from the project. This PR is based off of comments from #11176 ATP Railties
* | | | Allowing multiple rails applications in the same ruby instance.wangjohn2013-06-302-7/+226
|/ / / | | | | | | | | | | | | This change provides the ability to create a new application with a configuration which can be specified.
* | | Merge pull request #11176 from schneems/schneems/plugin_new_help_fixRafael Mendonça França2013-06-292-9/+11
|\ \ \ | | | | | | | | Fix `rails plugin --help`
| * | | Fix `rails plugin --help`schneems2013-06-292-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now if you run the `rails plugin --help` command it fails because rails expects a command in `railties/lib/rails/commands/plugin.rb` that does not exist because the file is named `plugin_new`. This is the error: ``` ruby-2.0.0-p0 ~/documents/projects/tmp/vanilla (master) $ rails plugin --help /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require': cannot load such file -- rails/commands/plugin (LoadError) from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `block in require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:213:in `load_dependency' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/railties-4.0.0/lib/rails/commands.rb:49:in `<top (required)>' from bin/rails:4:in `require' from bin/rails:4:in `<main>' ```
* | | | Update a broken link into the fixtures' templateRobin Dupret2013-06-291-1/+1
|/ / /
* / / Omit turbolinks configuration completely on skip_javascript generator optionNikita Fedyashev2013-06-283-3/+17
|/ /
* | Fix punctuation in config templatesAkira Matsuda2013-06-281-1/+1
| |
* | Removing deprecation message and silencing method.wangjohn2013-06-261-18/+0
|/ | | | | | | | The deprecation rake task is no longer useful because the deprecated methods have already been removed. The method for silencing stderr has been removed since it was only useful for `rake test:uncommitted` which was deprecated and removed.
* Review railties changelog [ci skip]Carlos Antonio da Silva2013-06-261-5/+4
|
* Removing deprecated rake tasks.wangjohn2013-06-243-101/+6
| | | | | The `rake test:recent` and `rake test:uncommitted` tasks were deprecated and are now being removed.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-06-261-0/+1
|\ | | | | | | | | Conflicts: guides/source/layout.html.erb
| * Missing mention about a generated file [ci skip]Robin Dupret2013-06-221-0/+1
| | | | | | | | Add a mention about the helper's test file generated invoking the controller generator in the USAGE file
* | remove trailing whitespace from `config/routes.rb` template.Yves Senn2013-06-261-1/+1
| |
* | Merge pull request #10666 from YanhaoYang/masterCarlos Antonio da Silva2013-06-251-1/+1
|\ \ | | | | | | Make "rails dbconsole" work with activerecord-postgis-adapter
| * | make "rails dbconsole" work with activerecord-postgis-adapterYanhaoYang2013-05-171-1/+1
| | |
* | | restore correct scaffold generationNolan Evans2013-06-251-1/+1
| | |
* | | Change reference to all to scoped instead.Steve Klabnik2013-06-251-1/+1
| | | | | | | | | | | | | | | | | | In #11088, `#to_a` was added to remove a deprecation around using `#all`. I merged, but it really should have been `#scoped` instead, as that's the preferred replacement.
* | | fix deprecation warning in scaffold controllersNolan Evans2013-06-251-1/+1
| | |
* | | Remove code related to the rails test commandRobin Dupret2013-06-211-2/+0
| | | | | | | | | | | | | | | Remove the mention about this command in the rails command's help message and remove the "t" alias related to it.
* | | Merge pull request #10537 from ↵Guillermo Iguaran2013-06-211-0/+23
|\ \ \ | | | | | | | | | | | | | | | | jetthoughts/10428_bug_with_config_assets_precompile #10428: Added tests for config.assets.precompile
| * | | #10428: Added tests for config.assets.precompilePaul Nikitochkin2013-06-211-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | Tests for bug in sprocket-rails: do not use value of configuration options which changed after environment loaded
* | | | Saying gemcutter => rubygems [ci skip]Arun Agrawal2013-06-211-1/+1
| | | |
* | | | Change from 'actionpack' to 'actionview' for locales pathŁukasz Strzałkowski2013-06-201-1/+1
|/ / /
* | | Removing a repetitive comment and removing a deprecation warning.wangjohn2013-06-171-24/+7
| | | | | | | | | | | | | | | | | | | | | The comment on the +env_config+ method is repetitive, likely to get outdated, and provides no useful information which cannot be gleamed from the code. I'm therefore removing it. I'm also refactoring the check for the presence of a secret_token in the configuration.
* | | Revert "Merge pull request #10961 from wangjohn/changing_rails_env_config"Santiago Pastorino2013-06-171-7/+24
| | | | | | | | | | | | | | | | | | This reverts commit 7098d6c9ab28931acc9562a00037567609f9e529, reversing changes made to 9ec2e2ee91568af24e09760a6de2890b89c33f56. This make some tests fail /cc @wangjohn
* | | Merge pull request #10968 from wangjohn/refactoring_rails_application_classSantiago Pastorino2013-06-172-95/+109
|\ \ \ | | | | | | | | Creating a class to build the default middleware stack.
| * | | Creating a class to build the default middleware stack.wangjohn2013-06-162-95/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of logic for building the default middleware stack is currently kept in Application class, but this can be encapsulated and made more modular by being moved to its own class. Also refactored a couple of the helper methods.
* | | | load the file rather than evalingAaron Patterson2013-06-171-1/+1
| | | |
* | | | Merge pull request #10961 from wangjohn/changing_rails_env_configSantiago Pastorino2013-06-171-24/+7
|\ \ \ \ | | | | | | | | | | Removing a repetitive comment and refactoring the Application class in Railties
| * | | | Removing a repetitive comment and refactoring the Application class inwangjohn2013-06-161-24/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Railties. The comment on the +env_config+ method is repetitive, likely to get outdated, and provides no useful information which cannot be gleamed from the code. I'm therefore removing it. I'm also refactoring the check for the presence of a secret_token in the configuration.
* | | | Merge pull request #10902 from wangjohn/removing_application_singleton_callsSantiago Pastorino2013-06-1712-23/+23
|\ \ \ \ | | | | | | | | | | Calls to the application constant have been refactored
| * | | | Calls to the application constant have been refactored to usewangjohn2013-06-1012-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Rails.application when drawing routes and creating other configurations on the application.
* | | | | Use Colspan in th TagsSıtkı Bağdat2013-06-172-3/+5
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is it more suitable that using ```<th colspan="3">``` instead of three empty ```<th>```? It is simple, but what i am missing about it? Change repetitive th tags to use colspan attribute Update CHANGELOG.md Update CHANGELOG.md