Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 6 | -61/+0 | |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | |||||
| * | | Removing ==Examples and last blank lines of docs from railties | Francesco Rodriguez | 2012-05-14 | 6 | -61/+0 | |
| | | | ||||||
* | | | prevent using already loaded Gemfile for 'bundle install', fix #6314 | Michal Papis | 2012-05-15 | 1 | -0/+8 | |
| | | | ||||||
* | | | Remove dates and environment variables from humans.txt | José Valim | 2012-05-14 | 1 | -2/+0 | |
| | | | ||||||
* | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵ | José Valim | 2012-05-14 | 1 | -3/+0 | |
| | | | | | | | | | | | | AS, closes #6287 | |||||
* | | | Remove remaining require 'rubygems' | Santiago Pastorino | 2012-05-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | require "rubygems" is obsolete in Ruby 1.9.3 | Kornelius Kalnbach | 2012-05-13 | 5 | -7/+0 | |
| | | | ||||||
* | | | Remove tailing spaces :scissors: [ci skip] | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Move AS set configs to AS Raitie | Santiago Pastorino | 2012-05-12 | 1 | -11/+1 | |
| | | | ||||||
* | | | Merge pull request #6271 from homakov/patch-5 | Santiago Pastorino | 2012-05-12 | 1 | -1/+11 | |
|\ \ \ | |/ / |/| | | configuration for active_support and JSON Encoding | |||||
| * | | Update railties/lib/rails/application/bootstrap.rb | Egor Homakov | 2012-05-11 | 1 | -1/+11 | |
| | | | ||||||
* | | | s/wether/whether [ci skip] | Vijay Dev | 2012-05-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #6277 from homakov/patch-6 | José Valim | 2012-05-12 | 1 | -0/+3 | |
|\ \ \ | | | | | | | | | Comment for active_support's option in application.rb | |||||
| * | | | Update railties/lib/rails/generators/rails/app/templates/config/application.rb | Egor Homakov | 2012-05-12 | 1 | -0/+3 | |
| |/ / | ||||||
* / / | Add commas missing in performance tests | Geoffrey Roguelon | 2012-05-12 | 1 | -1/+1 | |
|/ / | ||||||
* | | In robots.txt, User-agent should be all downcase except for the first 'U', ↵ | Enrico Carlesso | 2012-05-11 | 1 | -1/+1 | |
| | | | | | | | | according with http://en.wikipedia.org/wiki/Robots_exclusion_standard | |||||
* | | Fixes issue #6251 | David Padilla | 2012-05-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy. | |||||
* | | add humans.txt | Paul Campbell | 2012-05-08 | 1 | -0/+9 | |
| | | ||||||
* | | Merge pull request #5910 from route/rails-dbconsole | Jeremy Kemper | 2012-05-06 | 2 | -12/+29 | |
|\ \ | | | | | | | Fast path starts the database console without loading the full Rails env | |||||
| * | | More faster rails dbconsole | Dmitry Vorotilin | 2012-05-06 | 2 | -12/+29 | |
| | | | ||||||
* | | | Remove obsolete deep_dup requires | Piotr Sarnacki | 2012-05-06 | 1 | -2/+0 | |
| | | | ||||||
* | | | Nice logic for deep_dup in rails | Alexey Gaziev | 2012-05-06 | 1 | -0/+2 | |
|/ / | ||||||
* | | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 | |
| | | | | | | | | closes #4894 | |||||
* | | Add some docs and changelog entry | Carlos Antonio da Silva | 2012-05-04 | 1 | -2/+2 | |
| | | ||||||
* | | Allow overriding exception handling in threaded consumer | Carlos Antonio da Silva | 2012-05-04 | 1 | -1/+5 | |
| | | ||||||
* | | Allow configuring a different queue consumer | Carlos Antonio da Silva | 2012-05-04 | 3 | -6/+8 | |
| | | | | | | | | | | | | Also make sure to not use default queue consumer with custom queue implementation. It is up to the new queue implementation to start / shutdown the consumer. | |||||
* | | Merge pull request #5821 from Deradon/fix-engine-tasks | Piotr Sarnacki | 2012-05-03 | 1 | -1/+6 | |
|\ \ | | | | | | | Provided fix for calling rake tasks within mountable engines | |||||
| * | | Provided fix for calling rake tasks within mountable engines | Patrick Helm | 2012-04-12 | 1 | -1/+6 | |
| | | | ||||||
* | | | Merge pull request #6012 from avakhov/dbconsole-test | Piotr Sarnacki | 2012-05-03 | 1 | -22/+34 | |
|\ \ \ | | | | | | | | | Cover Rails::DBConsole with tests | |||||
| * | | | Add Rails::DBConsole tests | Alexey Vakhov | 2012-05-02 | 1 | -22/+34 | |
| | | | | ||||||
* | | | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presence | Jeremy Kemper | 2012-05-02 | 1 | -2/+0 | |
|\ \ \ \ | | | | | | | | | | | Gem const presence checking has been removed | |||||
| * | | | | Gem cont presence checking has been removed | Roman V. Babenko | 2012-05-02 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | Rakefile executable attributes and shebang lines has been removed | Roman V. Babenko | 2012-05-02 | 2 | -2/+0 | |
|/ / / / | ||||||
* / / / | Use new hash syntax in generated Gemfile | Oscar Del Ben | 2012-05-02 | 1 | -14/+14 | |
|/ / / | ||||||
* | | | Merge pull request #4345 from sunaku/patch-1 | Santiago Pastorino | 2012-05-01 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | gemspec assumes that user kept all generated files | |||||
| * | | | gemspec assumes that user kept all generated files | Suraj N. Kurapati | 2012-01-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | This commit allows the user be lazy and not update their gemspec's `files` directive after deleting unwanted files from their generated Rails plugin. | |||||
* | | | | Use :github option in Gemfile and make hashes consistent | Piotr Sarnacki | 2012-05-01 | 1 | -8/+8 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 3 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Revert "Added Short 1 line note about connection pools. " | Vijay Dev | 2012-05-01 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit c3954baee92446219606621c1b185360553a6d5d. | |||||
| * | | | | Added Short 1 line note about connection pools. | Gaurish Sharma | 2012-04-30 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | I hope its okay to add this here. if not, then please revert back. | |||||
| * | | | | Code-format references to config settings | Mark Rushakoff | 2012-04-27 | 3 | -3/+3 | |
| | | | | | ||||||
* | | | | | Fixed styling issues brought up by @jeremy | Jason Noble | 2012-04-30 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Add ability to specify custom annotation directories | Jason Noble & Ralph Shnelvar | 2012-04-30 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes Searches app, config, lib, script, test (default) Also searches dir1, dir2 References: #4536, #4540 | |||||
* | | | | | Merge pull request #5530 from ↵ | José Valim | 2012-04-30 | 2 | -0/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | malclocke/add_option_to_skip_index.html_on_rails_generate Added a generator option to skip the public/index.html file | |||||
| * | | | | | Added a generator option to remove the public/index.html file when ↵ | Ivan Vanderbyl | 2012-03-21 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generating a new Rails application The option is: -i, [--skip-index-html] # Skip public/index.html file | |||||
* | | | | | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 1 | -1/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove some unused variable assignments | |||||
| * | | | | | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -1/+0 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactor | Santiago Pastorino | 2012-04-29 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove some warnings and minor refactor in RoutesReloader | |||||
| * | | | | | | | Refactor RoutesReloader a bit to avoid creating extra hash objects | Carlos Antonio da Silva | 2012-04-28 | 1 | -3/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Define only writer method for queue, as reader is declared | Carlos Antonio da Silva | 2012-04-28 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecation warning of method redefined. |