aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Updated link to to GitHub article about ignoring files [ci skip]Prathamesh Sonpatki2013-05-051-1/+1
| | | | - http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files
* Fixes warning 'method redefined' in scaffold generators testsPrathamesh Sonpatki2013-05-051-4/+4
| | | | | | | | | | | | - f1805a697831 Redefined 'test_scaffold_generator_no_assets' twice. - Only the last instance of these three definitions of the same method was getting called when the tests were actually running. - This commit changes names of this method so that all three definitions will be called - scaffold.css is not generated by --assets=false switch. - Test was expecting the presence of the file with --assets=false - This issue was not discovered in f1805a697831b because it was redefining the same method twice
* dir -> directory [ci skip]Prathamesh Sonpatki2013-05-041-1/+1
|
* Use Ruby 1.9 syntaxRafael Mendonça França2013-05-041-2/+2
|
* Review the CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-041-1/+2
|
* Fixes Scaffold generator with --assets=falseArun Agrawal2013-05-043-0/+20
| | | | | | Scaffold generator with --assets=false option outputs an error See #9525
* Merge pull request #10436 from NARKOZ/keep-imagesRafael Mendonça França2013-05-043-0/+6
|\ | | | | generate 'app/assets/images' directory when creating new rails app. Fixes #10434
| * generate 'app/assets/images' directory when creating new rails appNihad Abbasov2013-05-043-0/+6
| |
* | Merge pull request #10461 from rwz/masterRafael Mendonça França2013-05-041-1/+1
|\ \ | | | | | | Relaxed jbuilder dependency in Gemfile template
| * | Relaxed jbuilder dependency in Gemfile templatePavel Pravosud2013-05-041-1/+1
| | |
* | | Add a test case for comparing Rails versionsSam Ruby2013-05-031-0/+5
| | | | | | | | | | | | https://github.com/rails/rails/commit/558d402472b49c4c99bf6753d341d7aef2e25dd4
* | | Fix generating route from engine to other enginePiotr Sarnacki2013-05-032-0/+46
| |/ |/| | | | | | | | | | | | | | | | | | | | | 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.wangjohn2013-05-021-18/+4
| |
* | Remove not used module from initializable testCarlos Antonio da Silva2013-05-011-9/+1
| |
* | Make railties version match RAILS_VERSIONSam Ruby2013-05-011-2/+2
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-011-0/+7
|\ \
| * | routes.rb should teach how to use concernsThiago Pinto2013-05-011-0/+7
| | |
* | | Removing the app constant and replacing it with Rails.applicationwangjohn2013-04-3013-18/+22
| | | | | | | | | | | | | | | syntax. This helps removing the class level abstraction of an application.
* | | Merge pull request #10357 from ↵Rafael Mendonça França2013-04-301-6/+6
|\ \ \ | | | | | | | | | | | | | | | | arunagw/minor-code-deuplication-removed-app-generator Minor code duplication removed
| * | | Minor code duplication removedArun Agrawal2013-04-291-6/+6
| | | |
* | | | Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-04-301-2/+2
| | | |
* | | | Removing Railtie::Configurable from the base Railtie object and makingwangjohn2013-04-295-21/+45
| | | | | | | | | | | | | | | | | | | | Railtie itself abstract. This stops the weird behavior of forcing subclasses of Railtie to include the Configurable module.
* | | | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-291-374/+2
| | | |
* | | | Bump version to rc1David Heinemeier Hansson2013-04-291-1/+1
|/ / /
* | | Moved the check for the rails test environment into rails/test_unit so that youwangjohn2013-04-232-4/+4
| | | | | | | | | | | | can select frameworks separately when running rake test.
* | | ActiveRecord -> Active RecordXavier Noria2013-04-221-1/+1
| | |
* | | extract path into variablebuddhamagnet2013-04-211-1/+3
| | |
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-04-191-2/+2
|\ \ \
| * | | Unindent attributes iteration in scaffold index templateCarlos Antonio da Silva2013-04-181-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>
* | | | AlignmentDavid Heinemeier Hansson2013-04-181-1/+1
|/ / /
* | | Indent around the scaffold loopDavid Heinemeier Hansson2013-04-181-8/+8
| | |
* | | HTML5 breaksDavid Heinemeier Hansson2013-04-182-4/+4
| | |
* | | Better orderingDavid Heinemeier Hansson2013-04-181-3/+3
| | |
* | | Use sass-rails 4.0.0.rc1Rafael Mendonça França2013-04-181-1/+1
| | |
* | | Use latest coffee-rails releaseRafael Mendonça França2013-04-181-1/+1
| | |
* | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."Rafael Mendonça França2013-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue
* | | Use secure source for rubygems in engine testsPrathamesh Sonpatki2013-04-181-1/+1
| | |
* | | adding a test for root path in the appAaron Patterson2013-04-171-0/+24
| | |
* | | Don't need to add activerecord-deprecated_finders on edge and devRafael Mendonça França2013-04-171-3/+1
| | | | | | | | | | | | | | | | | | | | | applications This gem will not change often to explain it be included in the application Gemfile
* | | Merge pull request #10178 from rubys/app_base_strip_heredocRafael Mendonça França2013-04-151-14/+12
|\ \ \ | |/ / |/| | Use strip_heredoc where possible
| * | Use strip_heredoc where possibleSam Ruby2013-04-111-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.
* | | Revert "Merge pull request #10194 from ↵Carlos Antonio da Silva2013-04-121-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 Silva2013-04-121-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 constantPablo Herrero2013-04-121-1/+3
| | | |
* | | | Added tests for `eager_load` config option to do not eager load for rake ↵Paul Nikitochkin2013-04-121-0/+17
| | | | | | | | | | | | | | | | tasks if `eager_load` is `true`
* | | | use unified and clean formatting in CHANGELOGS. [ci skip]Yves Senn2013-04-121-1/+1
| | | |
* | | | replaces Pathname#(dirname|realpath) with File.$1Xavier Noria2013-04-121-7/+2
| | | | | | | | | | | | | | | | Simpler, thanks to @rubys for the hint.
* | | | Merge pull request #10175 from vipulnsward/initialize_fixRafael Mendonça França2013-04-111-0/+1
|\ \ \ \ | |_|/ / |/| | | initialize instead of assert to fix warning
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 15:27:50 +0000