Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | | Close #3886 - Add THEAD and TBODY to scaffold markup | twinturbo | 2012-04-29 | 1 | -16/+20 |
| |/ / |/| | | |||||
* | | | Fix Engine#routes to not call draw_paths multiple times | Piotr Sarnacki | 2012-04-28 | 1 | -2/+4 |
| | | | |||||
* | | | Engine#routes? method has been fixed | Roman V. Babenko | 2012-04-28 | 1 | -1/+1 |
|/ / | |||||
* | | Use Rails::Queueing::Queue instead of Queue so people can build their own ↵ | José Valim | 2012-04-28 | 5 | -4/+12 |
| | | | | | | | | consumers around stdlib's Queue | ||||
* | | Fix failing test, TestQueue#contents is not #jobs | Carlos Antonio da Silva | 2012-04-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #6021 from sikachu/log_exception | José Valim | 2012-04-27 | 1 | -1/+5 |
|\ \ | | | | | | | Log the exception from the ThreadConsumer | ||||
| * | | Log the exception from the ThreadConsumer | Prem Sichanugrist | 2012-04-27 | 1 | -1/+5 |
| | | | | | | | | | | | | This will make sure you know when there's an exception occur. | ||||
* | | | adding the `jobs` method to the test queue for getting a list of test | Aaron Patterson | 2012-04-27 | 1 | -0/+8 |
|/ / | | | | | | | jobs. | ||||
* | | Extend stdlib queue for the test queue | Aaron Patterson | 2012-04-27 | 1 | -18/+2 |
| | | |||||
* | | Merge pull request #6020 from 7even/test_queue_order | Aaron Patterson | 2012-04-27 | 1 | -1/+1 |
|\ \ | | | | | | | Rails::Queueing::TestQueue run order | ||||
| * | | fixes run order in Rails::Queueing::TestQueue | Vsevolod Romashov | 2012-04-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-28 | 3 | -6/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+ | Mark Rushakof | 2012-04-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+) | ||||
| * | | Fix misprints in assert_file & assert_instance_method docs | Alexey Vakhov | 2012-04-26 | 1 | -4/+4 |
| | | | |||||
* | | | add a factory method for queue construction so that apps can have multiple ↵ | Aaron Patterson | 2012-04-27 | 1 | -1/+5 |
| | | | | | | | | | | | | queues | ||||
* | | | Missing git add :trollface: | Yehuda Katz | 2012-04-26 | 1 | -0/+65 |
| | | | |||||
* | | | Initial queue implementation | Yehuda Katz | 2012-04-26 | 6 | -2/+24 |
| | | | |||||
* | | | Routes reloader knows how to reload external files | Yehuda Katz | 2012-04-25 | 2 | -4/+12 |
| | | | |||||
* | | | Fix the build | Yehuda Katz | 2012-04-25 | 1 | -1/+1 |
| | | | |||||
* | | | Make files in paths consistent | Yehuda Katz | 2012-04-25 | 1 | -1/+1 |
| | | | |||||
* | | | Allow loading external route files from the router | Jose and Yehuda | 2012-04-25 | 3 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature enables the ability to load an external routes file from the router via: draw :filename External routes files go in +config/routes+. This feature works in both engines and applications. | ||||
* | | | Remove blank line at the end of routes.rb | Jeremy Kemper | 2012-04-25 | 1 | -2/+1 |
| | | | |||||
* | | | Merge pull request #5902 from avakhov/generator-no-indent-blank-lines | José Valim | 2012-04-25 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Don't indent blank lines in named base generators | ||||
| * | | Don't indent blank lines in named base generators | Alexey Vakhov | 2012-04-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5880 from asanghi/master | Jeremy Kemper | 2012-04-25 | 5 | -9/+9 |
|\ \ \ | |/ / |/| | | Stamp out ruby-debug with debugger everywhere else in the code base | ||||
| * | | and one more time | Aditya Sanghi | 2012-04-24 | 4 | -6/+6 |
| | | | |||||
| * | | another attempt at the language | Aditya Sanghi | 2012-04-18 | 3 | -4/+4 |
| | | | |||||
| * | | stamp out ruby-debug19 with extreme prejudice :) | Aditya Sanghi | 2012-04-17 | 5 | -9/+9 |
| | | | |||||
* | | | Remove default match without specified method | Jose and Yehuda | 2012-04-24 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964 | ||||
* | | | Merge pull request #5929 from FLOChip/notes | Jeremy Kemper | 2012-04-24 | 1 | -3/+7 |
|\ \ \ | | | | | | | | | `rake notes` and `rake notes:custom` now support css, scss, and css. | ||||
| * | | | `rake notes` and `rake notes:custom` now support | Teng Siong Ong | 2012-04-22 | 1 | -3/+7 |
| | | | | | | | | | | | | css, scss and css. | ||||
* | | | | Deleting insecure and "bad practice" code. related: ↵ | Egor Homakov | 2012-04-24 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | http://homakov.blogspot.com/2012/04/whitelist-your-routes-match-is-evil.html | ||||
* | | | | Only include Rake::DSL if it's defined. | Joe Van Dyk | 2012-04-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | rake < 0.9 doesn't define Rake::DSL. | ||||
* | | | | Refactor GeneratedAttributes | Carlos Antonio da Silva | 2012-04-22 | 1 | -7/+10 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | * Move reference? method to class to remove duplicated code * Move to_sym typecast from #initialize to .parse method (make it easier to refactor reference?), remove AS object/blank require * Use []= instead of merge!({}) * Remove in? in favor of include?, remove AS object/inclusion require | ||||
* | | | Remove unused generator options. This was added for the removed rails new --http | Santiago Pastorino | 2012-04-18 | 3 | -9/+0 |
| | | | |||||
* | | | Add hook for add_resource_route | Santiago Pastorino | 2012-04-18 | 3 | -7/+16 |
| | | | |||||
* | | | Add missing dependency for active_record_deprecated_finders | Juan Manuel Azambuja | 2012-04-18 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #5869 from LachyGroom/patch-1 | Piotr Sarnacki | 2012-04-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Changes b tag to strong | ||||
| * | | | Changes b tag to strong | CollectiveJam | 2012-04-16 | 1 | -1/+1 |
| |/ / | | | | | | | | | | The change is made due to importance of the attribute name (e.g. Name:) on the page (versus just stylistic / appearance sake tag). | ||||
* | | | the index option is always created if the type is one of references or ↵ | Vijay Dev | 2012-04-18 | 1 | -2/+4 |
| | | | | | | | | | | | | belongs_to. Refactoring it to a simpler form and fixing the build | ||||
* | | | let's not use `and` in place of `&&` | Vijay Dev | 2012-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #5835 from asanghi/master | Jeremy Kemper | 2012-04-16 | 1 | -1/+1 |
|\ \ | | | | | | | Update Gemfile to use 'debugger' instead of unmaintained 'ruby-debug19' | ||||
| * | | Hey, let's just make it easier for everyone and dump the unmaintained ↵ | Aditya Sanghi | 2012-04-14 | 1 | -1/+1 |
| | | | | | | | | | | | | ruby-debug19 and move to debugger. Whats the consensus here? If we want better adoption on ruby1.9, please lets just use this fork. |