Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Don't fight against ourselves for the default log level | Matthew Draper | 2014-08-22 | 1 | -2/+2 | |
| | | | | | | | If we want to always default to :debug, let's just do that. At which point the production.rb entry can become an "uncomment to change" instead. | |||||
* | Remove timestamp type from generator usage | Rafael Mendonça França | 2014-08-20 | 1 | -1/+0 | |
| | | | | It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be | |||||
* | Require ActiveJob in case a skip_xxx option is given | slainer68 | 2014-08-20 | 1 | -0/+1 | |
| | | | | Change position of require active_job | |||||
* | remove end-of-line spacing in development.rb, production.rb | Nick Sinenko | 2014-08-20 | 2 | -2/+2 | |
| | ||||||
* | Fix blank link on config/application.rb app template [ci skip] | Carlos Antonio da Silva | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | Point to right sass-rails version | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | Use web-console 2.0.0.beta2 on new apps | Guillermo Iguaran | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | Use released rails-html-sanitizer | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #16563 from arthurnn/add_ar_raise_trans_option | Rafael Mendonça França | 2014-08-19 | 1 | -0/+5 | |
|\ | | | | | Add default .raise_in_transactional_callbacks option to template | |||||
| * | Add default .raise_in_transactional_callbacks option to template | Arthur Neves | 2014-08-19 | 1 | -0/+5 | |
| | | ||||||
* | | loofah require dependecy is not needed anymore | Rafael Mendonça França | 2014-08-19 | 1 | -2/+0 | |
|/ | ||||||
* | Rack is released too | Rafael Mendonça França | 2014-08-18 | 1 | -4/+2 | |
| | ||||||
* | No need to point to arel and i18n master anymore | Rafael Mendonça França | 2014-08-18 | 1 | -6/+2 | |
| | ||||||
* | Fix rails-html_sanitizer in Gemfile template | Jon Atack | 2014-08-18 | 1 | -1/+1 | |
| | | | [skip ci] | |||||
* | Merge pull request #16062 from sgrif/sg-required-generators | Rafael Mendonça França | 2014-08-17 | 1 | -4/+20 | |
|\ | | | | | Add a `required` option to the model generator | |||||
| * | Add a `required` option to the model generator | Sean Griffin | 2014-08-08 | 1 | -4/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | Syntax was chosen to follow the passing of multiple options to decimal/numeric types. Curly braces, and allowing any of `,`, `.`, or `-` to be used as a separator to avoid the need for shell quoting. (I'm intending to expand this to all columns, but that's another PR. The `required` option will cause 2 things to change. `required: true` will be added to the association. `null: false` will be added to the column in the migration. | |||||
* | | Merge branch 'master' into loofah | Rafael Mendonça França | 2014-08-17 | 3 | -5/+2 | |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md | |||||
| * \ | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-17 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Lock web-console to 2.0.0.beta1 for the first 4.2 beta | Genadi Samokovarov | 2014-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The console on exception code isn't available on the stable releases yet. Lock it for now, so the beta users get a sneak peak of the console features. | |||||
| * | | | Dont encourage people to run without autoflush in production | David Heinemeier Hansson | 2014-08-17 | 1 | -3/+0 | |
| |/ / | ||||||
| * | | s/Dont'/Don't/ | Akira Matsuda | 2014-08-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | Use the release gems and point application gemfile to right loofah | Rafael Mendonça França | 2014-08-17 | 1 | -1/+3 | |
| | | | ||||||
* | | | 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 | |
| | | |