| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | Merge pull request #1609 from sikachu/master-javascript | Aaron Patterson | 2011-06-09 | 3 | -1/+6 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is... | Prem Sichanugrist | 2011-06-09 | 3 | -1/+6 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #1606 from neerajdotname/remove_users_controller_from_test | José Valim | 2011-06-09 | 1 | -3/+0 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | remove unused user_controller from test | Neeraj Singh | 2011-06-08 | 1 | -3/+0 |
| | |_|_|/ / /
| |/| | | | | |
|
* | | | | | | | Merge pull request #1356 from flippingbits/fix_engine_generator | José Valim | 2011-06-09 | 18 | -50/+209 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Prepend bundle exec to get the correct Rake version | Stefan Sprenger | 2011-06-07 | 1 | -3/+3 |
| * | | | | | | | Use RAILS_ISOLATED_ENGINE and fix namespaced generators tests | Stefan Sprenger | 2011-06-07 | 4 | -12/+3 |
| * | | | | | | | Use mattr_accessor :namespace | Stefan Sprenger | 2011-06-07 | 2 | -13/+2 |
| * | | | | | | | Don't create full Rails application if RAILS_ISOLATION_COMMAND equals engine | Stefan Sprenger | 2011-06-07 | 1 | -1/+1 |
| * | | | | | | | Use namespace if it's a mountable engine | Stefan Sprenger | 2011-06-07 | 5 | -12/+61 |
| * | | | | | | | Added regression tests | Stefan Sprenger | 2011-06-07 | 1 | -12/+5 |
| * | | | | | | | Move test/engine/generators_test.rb to test/railties/generators_test.rb | Stefan Sprenger | 2011-06-07 | 1 | -1/+1 |
| * | | | | | | | Add test for helper generator | Stefan Sprenger | 2011-06-07 | 1 | -3/+10 |
| * | | | | | | | Clean up engine's generator test and use bundle exec for invoking generators | Stefan Sprenger | 2011-06-07 | 1 | -13/+30 |
| * | | | | | | | Clean up engine generators_test code and add test for models correctly namesp... | Ryan Bigg | 2011-06-07 | 1 | -7/+19 |
| * | | | | | | | Add beginnings of test for generators within the context of an engine | Ryan Bigg | 2011-06-07 | 1 | -0/+54 |
| * | | | | | | | We moved engine commands to rails/engine/commands | Stefan Sprenger | 2011-05-27 | 1 | -5/+1 |
| * | | | | | | | Add destroy to engine's commands | Stefan Sprenger | 2011-05-27 | 1 | -2/+3 |
| * | | | | | | | Generate script/rails only if --full is given | Stefan Sprenger | 2011-05-27 | 3 | -5/+7 |
| * | | | | | | | Refactor identifying generator's destination root | Stefan Sprenger | 2011-05-27 | 1 | -5/+2 |
| * | | | | | | | Fix appending ' | Stefan Sprenger | 2011-05-27 | 1 | -1/+1 |
| * | | | | | | | We're using module not class for namespacing | Stefan Sprenger | 2011-05-27 | 1 | -8/+8 |
| * | | | | | | | Move requiring engine out of the switch case | Stefan Sprenger | 2011-05-27 | 1 | -4/+3 |
| * | | | | | | | Fix and test ENGINE_PATH and ENGINE_ROOT | Stefan Sprenger | 2011-05-27 | 2 | -2/+10 |
| * | | | | | | | Introducing engine commands | Stefan Sprenger | 2011-05-26 | 3 | -3/+48 |
| * | | | | | | | Move load_generators from Rails::Application to Rails::Engine | Stefan Sprenger | 2011-05-26 | 2 | -12/+12 |
| * | | | | | | | We're now using generators directly | Stefan Sprenger | 2011-05-26 | 1 | -1/+0 |
* | | | | | | | | Merge pull request #1591 from smartinez87/unused | José Valim | 2011-06-08 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Remove unused 'y' variable. | Sebastian Martinez | 2011-06-08 | 1 | -2/+2 |
| * | | | | | | | | Remove unused 'quoted_column_names' variable. | Sebastian Martinez | 2011-06-08 | 1 | -1/+1 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #1588 from neerajdotname/remove_unused_class_with_symbol_r... | José Valim | 2011-06-08 | 1 | -12/+0 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | class WithSymbolReturningString is not used anywhere in the test. | Neeraj Singh | 2011-06-08 | 1 | -12/+0 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #1579 from bradleybuda/master | José Valim | 2011-06-08 | 2 | -4/+12 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Allow a Date to be frozen more than once without an error in Ruby 1.8.x | Bradley Buda | 2011-06-08 | 2 | -4/+12 |
* | | | | | | | | | Merge pull request #1577 from reu/useless-variable-set | José Valim | 2011-06-08 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | No need to create a new Arel::Table, as the arel_table method already creates... | Rodrigo Navarro | 2011-06-08 | 1 | -1/+0 |
| |/ / / / / / / / |
|
* | | | | | | | | | Merge pull request #1593 from r00k/master | Aaron Patterson | 2011-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Simplify boolean logic into ternary. | Ben Orenstein | 2011-06-08 | 1 | -1/+1 |
|/ / / / / / / / |
|
* | | | | | | | | Indention style + whitespace for readability | David Heinemeier Hansson | 2011-06-09 | 1 | -33/+38 |
* | | | | | | | | If you set a js_compressor, it means that you want shit compressed -- we dont... | David Heinemeier Hansson | 2011-06-09 | 1 | -2/+2 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #1564 from sikachu/master-changelog | Aaron Patterson | 2011-06-08 | 1 | -0/+29 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Update CHANGELOG to mention the new SafeBuffer change | Prem Sichanugrist | 2011-06-08 | 1 | -0/+29 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #1560 from sikachu/master-escapejs | José Valim | 2011-06-08 | 2 | -1/+8 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 2 | -1/+8 |
* | | | | | | | | Merge pull request #1559 from neerajdotname/before_filter_test | José Valim | 2011-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | Make test meaningful | Neeraj Singh | 2011-06-08 | 1 | -1/+1 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #1556 from thoefer/master | José Valim | 2011-06-08 | 3 | -5/+17 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Brought back alternative convention for namespaced models in i18n. | thoefer | 2011-06-08 | 3 | -5/+17 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #1550 from rsim/fix_test_has_many_with_pluralize_table_nam... | Xavier Noria | 2011-06-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | | |
|
| * | | | | | | Do not hardcode :id as it was ignored by mass assignment filter | Raimonds Simanovskis | 2011-06-08 | 1 | -2/+2 |
|/ / / / / / |
|