aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | valid_app_const? -> valid_const?Martin Schürrer2013-06-151-1/+1
| |
* | `initialize_on_precompile` is not used anymore.Terence Lee2013-06-133-16/+1
| |
* | Refactor of ::Rails moduleGenadi Samokovarov2013-06-121-12/+10
|/ | | | | | | 1. Used ActiveSupport::Autoload to dry-up the autoload definitions. 2. Used ActiveSupport's delegate to dry up the application proxied attributes. 3. Did a little white space change on Rails.groups.
* Testing CheckPending middlewareArun Agrawal2013-06-081-0/+8
|
* registers recent patch in the railties CHANGELOGXavier Noria2013-06-061-0/+4
|
* clearing autoloaded constants triggers routes reloading [Fixes #10685]Xavier Noria2013-06-062-9/+61
| | | | | Conflicts: railties/test/application/loading_test.rb
* Fixing build for not checking migrationArun Agrawal2013-06-051-0/+1
|
* Removing use of subclassed application constant and instead using thewangjohn2013-06-038-50/+50
| | | | | more agnostic Rails.application syntax. This means tests will be more portable, and won't rely on the existence of a particular subclass.
* Replace comment about Sprockets stub directive with a link to README about ↵Guillermo Iguaran2013-06-032-2/+4
| | | | all directives
* Fixing a failing railtie test by using the ENV variable to specify awangjohn2013-05-311-1/+2
| | | | particular controller to search for in rake routes.
* Adding a test to make sure that using rake routes with the CONTROLLERwangjohn2013-05-291-0/+12
| | | | environment works correctly.
* No need changelog entryRafael Mendonça França2013-05-281-2/+0
|
* condition simplifiedOleg Sukhodolsky2013-05-281-1/+1
|
* Merge pull request #10629 from stmpjmpr/bug_10628Rafael Mendonça França2013-05-282-1/+3
|\ | | | | | | Fixes bug 10628.
| * Fixes bug 10628.Scott Hill2013-05-152-1/+3
| |
* | add notice to server boot messages if using default 0.0.0.0 bindingLuke Wendling2013-05-251-0/+3
| |
* | Add ActiveModel requirement to application.rbJamie Gaskins2013-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | Currently, ActiveModel is only loaded by ActiveRecord. If you skip ActiveRecord, ActiveModel will not be required (or even autoloaded) and including `ActiveModel::Model` into a plain Ruby class will raise `NameError`. To reproduce this: - create a new app with `rails new my_app -O` - create a Ruby class that includes `ActiveModel::Model` in `app/models` - load up a Rails console and try to do anything with the class :-) Since ActionPack relies so heavily on the ActiveModel API, this should probably be considered a dependency of the app. Another possibility would be to make it a dependency of ActionController.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-191-0/+2
|\ \
| * | copy edits[ci skip]Vijay Dev2013-05-191-3/+1
| | |
| * | Added documentation for Rails::Generators::NamedBase.templateaditya-kapoor2013-05-141-0/+4
| | |
* | | Fxied some typosPrathamesh Sonpatki2013-05-182-2/+2
| | |
* | | plugin new missing license specAJ Acevedo2013-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When bundling a gem created with rails plugin new Bundler outputs the following warning when building the gem: WARNING: licenses is empty modified: railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
* | | Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-163-14/+14
|\ \ \ | | | | | | | | Squishy minitest5
| * | | Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-063-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Namespace changes, overhaul of runners. + Internal ivar name changes - Removed a logger globally applied to tests that spew everywhere?!? + Override Minitest#__run to sort tests by name. + Reworked testing isolation to work with the new cleaner architecture. - Removed a bunch of tests that just test minitest straight up. I think these changes were all merged to minitest 4 a long time ago. - Minor report output differences.
* | | | Merge pull request #10594 from shime/rack-debuggerAaron Patterson2013-05-162-4/+4
|\ \ \ \ | | | | | | | | | | exit with non-zero to signal failure
| * | | | exit with non-zero to signal failureHrvoje Šimić2013-05-132-4/+4
| | | | |
* | | | | restore whitespace in Gemfile between sqlite3 and sprocketsSam Ruby2013-05-161-1/+1
| | | | |
* | | | | Remove trailing line breakColin Bartlett2013-05-161-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | If you generate a fresh app without ActiverRecord, this template exhibited a lone trailing line break. My watchful pre-commit hook told me about it so I've fixed it here.
* | | | Removed incorrect warning from application.js templates and replaced it with ↵Nick2013-05-152-4/+2
|/ / / | | | | | | | | | stub command description
* | | Updated comment to Rails 4AJ Acevedo2013-05-121-1/+1
| | |
* | | better error message when app name is not passed in `rails new`Hrvoje Šimić2013-05-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, for the following command: $ rails new we received "Options should be given after the application name" as an error message. This is outdated and should be "Application name should be provided in arguments".
* | | Merge pull request #10560 from jkutner/masterRafael Mendonça França2013-05-122-5/+0
|\ \ \ | |_|/ |/| | Remove jruby-openssl from default Gemfile
| * | Removed jruby-openssl gem from default template GemfileJoe Kutner2013-05-102-5/+0
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-121-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | Improve model generator USAGE grammarMatthew Michihara2013-05-051-5/+5
| | | |
* | | | Clean up unused method for `rake doc`.Teng Siong Ong2013-05-111-5/+0
| |/ / |/| |
* | | rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-092-2/+2
| | |
* | | "rails" -> "Rails" [ci skip]Xavier Noria2013-05-091-2/+2
| | |
* | | Fix Typo existant -> existent [ci skip]Prathamesh Sonpatki2013-05-081-2/+2
| |/ |/|
* | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]Xavier Noria2013-05-061-45/+56
| | | | | | | | See the comment in the rescue clause towards the top of the patch for the rationale.