Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prepare for partial release. | Kasper Timm Hansen | 2014-08-17 | 1 | -0/+3 |
| | | | | | | | - Default to Rails::DeprecatedSanitizer in ActionView::Helpers::SanitizeHelper. - Add upgrade notes. - Add sanitizer to new applications Gemfiles. - Remove 'rails-dom-testing' as a dependency. | ||||
* | Fixes test for Gemfile entry changes | Arun Agrawal | 2014-08-08 | 2 | -2/+2 |
| | | | | Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c | ||||
* | Pull spring gem entry into the Gemfile template instead of gemfile_entries ↵ | David Heinemeier Hansson | 2014-08-07 | 2 | -10/+12 |
| | | | | so it can be grouped with the other development tools | ||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-07 | 2 | -0/+17 |
|\ | |||||
| * | Merge pull request #16359 from skanev/after-bundle-in-rails-templates | Yves Senn | 2014-08-06 | 2 | -0/+17 |
| |\ | | | | | | | | | | | | | | | | | | | Add an after_bundle callback in Rails templates Conflicts: railties/CHANGELOG.md | ||||
| | * | Add an after_bundle callback in Rails templates | Stefan Kanev | 2014-08-03 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | | | The template runs before the generation of binstubs – this does not allow to write one, that makes an initial commit to version control. It is solvable by adding an after_bundle callback. | ||||
* | | | Stop using padding in the generated Gemfile -- it looks shit | David Heinemeier Hansson | 2014-08-07 | 2 | -6/+1 |
|/ / | |||||
* | | Bring back the helpers tests | José Valim | 2014-08-05 | 2 | -0/+11 |
| | | | | | | | | | | Also keep the hook as other tools may rely on it, we just don't do anything by default on Rails. | ||||
* | | Fix typo [ci skip] | Jon Atack | 2014-08-04 | 1 | -1/+1 |
| | | |||||
* | | Explain why we use asset digests, not what a setter does | David Heinemeier Hansson | 2014-08-03 | 2 | -2/+4 |
| | | |||||
* | | Add suggestion as to how you can app the the assets load path | David Heinemeier Hansson | 2014-08-03 | 1 | -0/+3 |
| | | |||||
* | | A few more tests asserting the presence of helper test stubs | David Heinemeier Hansson | 2014-08-03 | 2 | -5/+0 |
| | | |||||
* | | Change the production log level default from :info to :debug. All production ↵ | David Heinemeier Hansson | 2014-08-03 | 1 | -2/+2 |
| | | | | | | | | apps I have ever worked with has done this. Let us reflect that default. You often want those SQL quieries to be able to debug issues in production | ||||
* | | Generating stubs for helper tests is overly specific. Most helpers should ↵ | David Heinemeier Hansson | 2014-08-03 | 3 | -21/+0 |
|/ | | | | simply be tested as part of the view thats using them. If you need something beyond that, you can add a test yourself for them | ||||
* | Give password_confirmation div the "field" class in erb form template | noinkling | 2014-07-29 | 1 | -1/+1 |
| | |||||
* | Additional clarification on password:digest in scaffold and model generator ↵ | noinkling | 2014-07-25 | 2 | -4/+16 |
| | | | | help [ci skip] | ||||
* | Add password:digest information to scaffold generator help text [ci skip] | noinkling | 2014-07-25 | 1 | -1/+5 |
| | |||||
* | Fix syntax error | Rafael Mendonça França | 2014-07-23 | 1 | -1/+2 |
| | |||||
* | Dev and edge application and plugins need to include i18n master | Rafael Mendonça França | 2014-07-23 | 1 | -1/+2 |
| | |||||
* | Set Psych as the YAML engine for Rubinius | Robin Dupret | 2014-07-23 | 1 | -0/+9 |
| | | | | | | | | | | Since the rubysl-yaml gem doesn't ship with Psych by default because of its dependency on libyaml, on Rubinius, the default engine is Syck. However, if we want to be able to run the application safely on different rubies, we need to make people using Rubinius rely on Psych. See http://git.io/uuLVag for further information. | ||||
* | Merge pull request #16212 from ↵ | Rafael Mendonça França | 2014-07-18 | 1 | -1/+2 |
|\ | | | | | | | | | | | aantix/additional_migration_conflict_help_messaging Additional help messaging to help the user resolve a conflicted migration | ||||
| * | Modified migration conflict message to remove the string concatenation. | Jim Jones | 2014-07-18 | 1 | -3/+3 |
| | | |||||
| * | Added additional help messaging when there's scaffolding being generated and ↵ | Jim Jones | 2014-07-17 | 1 | -1/+2 |
|/ | | | | | | a migration already exists for the resource. The user is now alerted that they are able to skip the conflicted migration file via the --skip option. | ||||
* | Keep quietly and capture undeprecated on your suite | Rafael Mendonça França | 2014-07-15 | 1 | -0/+17 |
| | |||||
* | Merge pull request #13999 from jamox/update_rack | Aaron Patterson | 2014-07-08 | 1 | -2/+4 |
|\ | | | | | This updates rails to use edge rack | ||||
| * | Upgraded rack | Jarmo Isotalo | 2014-05-19 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | As Rack has some non backwards compatible changes added required modifications to keep behaviour in rails close to same as before. Also modified generators to include rack/rack for not yet released version of rack | ||||
* | | Merge pull request #16046 from grosser/grosser/cleangen | Rafael Mendonça França | 2014-07-04 | 1 | -2/+1 |
|\ \ | | | | | | | Do not load rails without loading bundler | ||||
| * | | remove bundler magic | grosser | 2014-07-03 | 1 | -2/+1 |
| | | | |||||
* | | | Display notice in index.html pages in scaffolded generated views | Arun Agrawal | 2014-07-04 | 1 | -0/+2 |
|/ / | | | | | | | | | | | | | | | | | As we are setting notice in destroy action we should display that For more information see https://github.com/rails/rails/pull/14044 And https://github.com/rails/jbuilder/pull/191 closes #14044 | ||||
* | | Talk about config.assts.version move too | Rafael Mendonça França | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | Closes #15942 | ||||
* | | Require shellwords since it is dependecy of this file | Rafael Mendonça França | 2014-06-26 | 1 | -0/+2 |
| | | | | | | | | Closes #15919 | ||||
* | | Add a '--skip-routes' flag for the Controller generator. | Lucas Mazza | 2014-06-24 | 1 | -2/+6 |
| | | | | | | | | | | This way it is possible to skip the addition of the 'get "foo/bar"' routes when generating a controller. | ||||
* | | Titling the model name in views generated by scaffold. | Amit Suryavanshi | 2014-06-18 | 3 | -3/+3 |
| | | | | | | | | | | eg. rails g scaffold UserProfile will have in index.html.erb "Listing User Profiles" rather than Listing user_profiles. | ||||
* | | :scissors: | Rafael Mendonça França | 2014-06-17 | 1 | -8/+8 |
| | | |||||
* | | Add a generic --skip-gems options to generator | Rafael Mendonça França | 2014-06-17 | 1 | -8/+6 |
| | | | | | | | | | | | | | | | | | | | | Also remove --skip-turbolinks. This option is useful if users want to remove some gems like jbuilder, turbolinks, coffee-rails, etc that don't have specific options on the generator. rails new my_app --skip-gems turbolinks coffee-rails | ||||
* | | Add an option to skip installation of Turbolinks | Marc Schütz | 2014-06-14 | 1 | -2/+7 |
| | | |||||
* | | [ci skip] Fix capitalization | Akshay Vishnoi | 2014-06-07 | 1 | -4/+4 |
| | | |||||
* | | remove rubyforge.org that was shut down [ci skip] | Gaurav Sharma | 2014-06-06 | 2 | -4/+2 |
| | | |||||
* | | File.exist? instead of File.exists? in bin/setup | David Jones | 2014-06-02 | 1 | -1/+1 |
| | | | | | | | | | | File.exists? is deprecated in Ruby 2.1+ https://github.com/ruby/ruby/blob/v2_1_2/file.c#L1413 | ||||
* | | bin/setup uses `bundle check || bundle install` to improve performance. | Yves Senn | 2014-05-30 | 1 | -1/+1 |
| | | |||||
* | | `bin/setup` script to bootstrap applications. | Yves Senn | 2014-05-30 | 1 | -0/+28 |
| | | |||||
* | | Merge pull request #15327 from alexbel/replace_double_quotes_with_single_quotes | Yves Senn | 2014-05-27 | 1 | -4/+13 |
|\ \ | | | | | | | | | | Replace double quotes with single quotes while adding an entry into Gemfile | ||||
| * | | Replace double quotes with single quotes while adding an entry into Gemfile | alexbel | 2014-05-26 | 1 | -4/+14 |
|/ / | |||||
* | | integration tests do not need to load fixtures by hand | Xavier Noria | 2014-05-25 | 1 | -3/+0 |
| | | | | | | | | | | I don't know when this changed, checked back up to 3.2 and integration tests instantiate fixtures just fine. | ||||
* | | Merge pull request #15299 from andriytyurnikov/engine_friendly_rake_stats | Rafael Mendonça França | 2014-05-24 | 1 | -0/+4 |
|\ \ | | | | | | | rake stats for engines | ||||
| * | | rake stats for engines | Andriy Tyurnikov | 2014-05-24 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #15298 from ShunsukeAida/fix_capitalization | Rafael Mendonça França | 2014-05-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fixed capitalization [ci skip] | ||||
| * | | | fixed capitalization | ShunsukeAida | 2014-05-25 | 1 | -1/+1 |
| |/ / | |||||
* | | | Add FIXME note about the thor bug | Rafael Mendonça França | 2014-05-24 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #9083 from bronson/patch-1 | Rafael Mendonça França | 2014-05-24 | 1 | -1/+4 |
|\ \ \ | |/ / |/| | | | | | avoid using alias in generators |