| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | rails -> Rails [ci skip] | Prathamesh Sonpatki | 2013-05-09 | 2 | -2/+2 | |
| | | | ||||||
| * | | "rails" -> "Rails" [ci skip] | Xavier Noria | 2013-05-09 | 1 | -2/+2 | |
| | | | ||||||
| * | | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462] | Xavier Noria | 2013-05-06 | 1 | -45/+56 | |
| | | | | | | | | | See the comment in the rescue clause towards the top of the patch for the rationale. | |||||
| * | | Updated link to to GitHub article about ignoring files [ci skip] | Prathamesh Sonpatki | 2013-05-05 | 1 | -1/+1 | |
| | | | | | | | | | - http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files | |||||
| * | | dir -> directory [ci skip] | Prathamesh Sonpatki | 2013-05-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | Use Ruby 1.9 syntax | Rafael Mendonça França | 2013-05-04 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fixes Scaffold generator with --assets=false | Arun Agrawal | 2013-05-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | | Scaffold generator with --assets=false option outputs an error See #9525 | |||||
| * | | Merge pull request #10436 from NARKOZ/keep-images | Rafael Mendonça França | 2013-05-04 | 2 | -0/+1 | |
| |\ \ | | | | | | | generate 'app/assets/images' directory when creating new rails app. Fixes #10434 | |||||
| | * | | generate 'app/assets/images' directory when creating new rails app | Nihad Abbasov | 2013-05-04 | 2 | -0/+1 | |
| | | | | ||||||
| * | | | Merge pull request #10461 from rwz/master | Rafael Mendonça França | 2013-05-04 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Relaxed jbuilder dependency in Gemfile template | |||||
| | * | | | Relaxed jbuilder dependency in Gemfile template | Pavel Pravosud | 2013-05-04 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix generating route from engine to other engine | Piotr Sarnacki | 2013-05-03 | 1 | -0/+1 | |
| | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A regression was introduced in 5b3bb6, generating route from within an engine to an another engine resulted in prefixing a path with the SCRIPT_NAME value. The regression was caused by the fact that SCRIPT_NAME should be appended only if it's the SCRIPT_NAME for the application, not if it's SCRIPT_NAME from the current engine. closes #10409 | |||||
| * | | | Refactoring the creation of TestTasks to remove code duplication. | wangjohn | 2013-05-02 | 1 | -18/+4 | |
| | | | | ||||||
| * | | | Make railties version match RAILS_VERSION | Sam Ruby | 2013-05-01 | 1 | -2/+2 | |
| | |/ |/| | ||||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 1 | -0/+7 | |
| |\ \ | ||||||
| | * | | routes.rb should teach how to use concerns | Thiago Pinto | 2013-05-01 | 1 | -0/+7 | |
| | | | | ||||||
| | * | | Revert "Merge pull request #10194 from ↵ | Carlos Antonio da Silva | 2013-04-12 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion" This reverts commit 81f243375b9d3cfd431c1ca904c5c1efc9a41ae8, reversing changes made to c7673b0981d961e5510c85d958c944876d543314. | |||||
| | * | | Merge pull request #10194 from ↵ | Carlos Antonio da Silva | 2013-04-12 | 1 | -1/+3 | |
| | |\ \ | | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion Extract method declaration regexp for assert_method into a constant | |||||
| | | * | | Extract method declaration regexp into a constant | Pablo Herrero | 2013-04-12 | 1 | -1/+3 | |
| | | | | | ||||||
| * | | | | Removing the app constant and replacing it with Rails.application | wangjohn | 2013-04-30 | 11 | -14/+18 | |
| | | | | | | | | | | | | | | | | | | | | | syntax. This helps removing the class level abstraction of an application. | |||||
| * | | | | Merge pull request #10357 from ↵ | Rafael Mendonça França | 2013-04-30 | 1 | -6/+6 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | arunagw/minor-code-deuplication-removed-app-generator Minor code duplication removed | |||||
| | * | | | | Minor code duplication removed | Arun Agrawal | 2013-04-29 | 1 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | Make `rake doc:guides` works again. Fix #10384. | Teng Siong Ong | 2013-04-30 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Removing Railtie::Configurable from the base Railtie object and making | wangjohn | 2013-04-29 | 2 | -6/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Railtie itself abstract. This stops the weird behavior of forcing subclasses of Railtie to include the Configurable module. | |||||
| * | | | | | Bump version to rc1 | David Heinemeier Hansson | 2013-04-29 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Moved the check for the rails test environment into rails/test_unit so that you | wangjohn | 2013-04-23 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | can select frameworks separately when running rake test. | |||||
| * | | | | ActiveRecord -> Active Record | Xavier Noria | 2013-04-22 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2013-04-19 | 1 | -2/+2 | |
| |\ \ \ \ | ||||||
| | * | | | | Unindent attributes iteration in scaffold index template | Carlos Antonio da Silva | 2013-04-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we get extra indent for the <td> elements due to the extra spaces at the beginning of the lines, like this: <tr> <td><%= author.name %></td> <td><%= link_to 'Show', author %></td> <td><%= link_to 'Edit', edit_author_path(author) %></td> | |||||
| * | | | | | Alignment | David Heinemeier Hansson | 2013-04-18 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Indent around the scaffold loop | David Heinemeier Hansson | 2013-04-18 | 1 | -8/+8 | |
| | | | | | ||||||
| * | | | | HTML5 breaks | David Heinemeier Hansson | 2013-04-18 | 2 | -4/+4 | |
| | | | | | ||||||
| * | | | | Better ordering | David Heinemeier Hansson | 2013-04-18 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Use sass-rails 4.0.0.rc1 | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Use latest coffee-rails release | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet." | Rafael Mendonça França | 2013-04-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue | |||||
| * | | | | Don't need to add activerecord-deprecated_finders on edge and dev | Rafael Mendonça França | 2013-04-17 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applications This gem will not change often to explain it be included in the application Gemfile | |||||
| * | | | | Use strip_heredoc where possible | Sam Ruby | 2013-04-11 | 1 | -14/+12 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following up on an observation by @rafaelfranca https://github.com/rails/rails/pull/10170/files#r3753963 Reduce the number of gsub calls to the two cases where inputs are concatenated from various sources and with inconsistent indentation. Also zap extraneous spacing from the sass-rails line... presumably this is a holdover from a previous time where this aligned the version string with an adjacent line. | |||||
| * | | | application loader refactor and test suite complete rewrite | Xavier Noria | 2013-04-11 | 1 | -28/+27 | |
| | | | | ||||||
| * | | | Editorial pass over generated Gemfile | Sam Ruby | 2013-04-10 | 2 | -7/+11 | |
| | | | | | | | | | | | | | | | | | | | * When run with default options, no repeated blank lines * Every gem has a comment, perhaps a generic one, but a comment nonetheless * Most comments used to start with "Use", some with "To use" => made consistent | |||||
| * | | | code review of 22e5ab3 | Xavier Noria | 2013-04-10 | 1 | -8/+7 | |
| | | | | ||||||
| * | | | Searching for rails executable correctly | Prathamesh Sonpatki | 2013-04-10 | 1 | -16/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Current logic of finding Rails executable in parent directory is not returning full path of executable if it is found in one of the parent directories * To compensate for this, we have to call exec_app_rails recursively until the executable is found or we cant do 'chdir' anymore * This solution finds the correct executable path from parent directory(s) recursively | |||||
| * | | | Explain how to upgrade bin/ for Rails 4 | Jeremy Kemper | 2013-04-09 | 1 | -8/+29 | |
| | | | | ||||||
| * | | | Merge pull request #9843 from indirect/rails_bin | Rafael Mendonça França | 2013-04-09 | 1 | -10/+20 | |
| |\ \ \ | |/ / |/| | | Rails 4 prints help for "rails new" when running "rails console" | |||||
| | * | | fix binstub typo | Andre Arko | 2013-03-30 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | need to delete bin, not binstub, update wording | Andre Arko | 2013-03-27 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | script/rails could never be from bundler | Andre Arko | 2013-03-27 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | rails commands even if bin/rails is a gem stub | Andre Arko | 2013-03-20 | 1 | -10/+20 | |
| | | | | ||||||
| * | | | sprockets 2.9.x doesn't work with uglifier 2.0 yet. | Rafael Mendonça França | 2013-04-06 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | See https://travis-ci.org/rails/rails/jobs/6110543#L1285 for the failure cc @josh | |||||
| * | | | remove unused variables | Vipul A M | 2013-04-06 | 2 | -2/+1 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |