aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #16062 from sgrif/sg-required-generatorsRafael Mendonça França2014-08-171-4/+20
|\ | | | | Add a `required` option to the model generator
| * Add a `required` option to the model generatorSean Griffin2014-08-081-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 loofahRafael Mendonça França2014-08-177-41/+12
|\ \ | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * \ Merge pull request #16294 from bf4/code_toolsRafael Mendonça França2014-08-171-35/+0
| |\ \ | | | | | | | | Update, unify, encapsulate, and fix various code tools in Rails
| | * | Remove unused, broken, legacy ruby-prof extension from 2005Benjamin Fleischer2014-07-251-35/+0
| | | | | | | | | | | | | | | | [ci skip]
| * | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-173-1/+9
| |\ \ \
| | * \ \ Merge pull request #16485 from seuros/activejobDavid Heinemeier Hansson2014-08-172-0/+8
| | |\ \ \ | | | | | | | | | | | | Integrate ActiveJob / DeliverLater / GlobalID with Rails
| | | * | | Added docs for AJ::Callbacks; Added AJ to docs build mapCristian Bica2014-08-161-0/+7
| | | | | |
| | | * | | Remove activejob integration testsAbdelkader Boudih2014-08-121-0/+1
| | | | | |
| | * | | | Lock web-console to 2.0.0.beta1 for the first 4.2 betaGenadi Samokovarov2014-08-181-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 productionDavid Heinemeier Hansson2014-08-171-3/+0
| |/ / / /
| * | | | Merge pull request #16467 from strzalek/cookies-digest-config-option2Godfrey Chan2014-08-171-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies digest config option (pt. 2) Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/middleware/cookies.rb
| | * | | | Add config option for cookies digestŁukasz Strzałkowski2014-08-121-1/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = 'SHA256'
| * | | | s/Dont'/Don't/Akira Matsuda2014-08-151-1/+1
| | |/ / | |/| |
* | | | Use the release gems and point application gemfile to right loofahRafael Mendonça França2014-08-171-1/+3
| | | |
* | | | Prepare for partial release.Kasper Timm Hansen2014-08-171-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.
* | | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-081-2/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699. IT BROKE THE BUILD!!!
* | | Merge pull request #16434 from strzalek/cookies-digest-config-optionSantiago Pastorino2014-08-081-1/+2
|\ \ \ | | | | | | | | Add digest config option for SignedCookiesJar
| * | | Return preconfigured AS::MessageVerifierŁukasz Strzałkowski2014-08-081-1/+1
| | | |
| * | | Add config option for cookies digestŁukasz Strzałkowski2014-08-081-0/+1
| |/ / | | | | | | | | | | | | | | | You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = \SHA256'
* | | save a hash allocation per request.Aaron Patterson2014-08-081-1/+1
| | |
* | | Fixes test for Gemfile entry changesArun Agrawal2014-08-082-2/+2
|/ / | | | | | | Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c
* | Pull spring gem entry into the Gemfile template instead of gemfile_entries ↵David Heinemeier Hansson2014-08-072-10/+12
| | | | | | | | so it can be grouped with the other development tools
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-074-10/+50
|\ \
| * | add a new constructor that runs load hooksAaron Patterson2014-08-071-0/+4
| | |
| * | defer running after_config hooks until after the object is allocatedAaron Patterson2014-08-071-7/+22
| | |
| * | lazily instantiate application subclassesAaron Patterson2014-08-062-4/+8
| | | | | | | | | | | | this means we can meaningfully override methods in the subclass
| * | Merge pull request #16359 from skanev/after-bundle-in-rails-templatesYves Senn2014-08-062-0/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add an after_bundle callback in Rails templates Conflicts: railties/CHANGELOG.md
| | * | Add an after_bundle callback in Rails templatesStefan Kanev2014-08-032-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 shitDavid Heinemeier Hansson2014-08-072-6/+1
|/ / /
* | | Bring back the helpers testsJosé Valim2014-08-052-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 Atack2014-08-041-1/+1
| | |
* | | Explain why we use asset digests, not what a setter doesDavid Heinemeier Hansson2014-08-032-2/+4
| | |
* | | Add suggestion as to how you can app the the assets load pathDavid Heinemeier Hansson2014-08-031-0/+3
| | |
* | | Pull in the custom configuration concept from dhh/custom_configurationDavid Heinemeier Hansson2014-08-031-1/+13
| | |
* | | A few more tests asserting the presence of helper test stubsDavid Heinemeier Hansson2014-08-032-5/+0
| | |
* | | Change the production log level default from :info to :debug. All production ↵David Heinemeier Hansson2014-08-031-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 Hansson2014-08-033-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
* | Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | Email does not support relative links since there is no implicit host. Therefore all links inside of emails must be fully qualified URLs. All path helpers are now deprecated. When removed, the error will give early indication to developers to use `*_url` methods instead. Currently if a developer uses a `*_path` helper, their tests and `mail_view` will not catch the mistake. The only way to see the error is by sending emails in production. Preventing sending out emails with non-working path's is the desired end goal of this PR. Currently path helpers are mixed-in to controllers (the ActionMailer::Base acts as a controller). All `*_url` and `*_path` helpers are made available through the same module. This PR separates this behavior into two modules so we can extend the `*_path` methods to add a Deprecation to them. Once deprecated we can use this same area to raise a NoMethodError and add an informative message directing the developer to use `*_url` instead. The module with warnings is only mixed in when a controller returns false from the newly added `supports_relative_path?`. Paired @sgrif & @schneems
* | Give password_confirmation div the "field" class in erb form templatenoinkling2014-07-291-1/+1
| |
* | Additional clarification on password:digest in scaffold and model generator ↵noinkling2014-07-252-4/+16
| | | | | | | | help [ci skip]
* | Add password:digest information to scaffold generator help text [ci skip]noinkling2014-07-251-1/+5
|/
* Fix syntax errorRafael Mendonça França2014-07-231-1/+2
|
* Dev and edge application and plugins need to include i18n masterRafael Mendonça França2014-07-231-1/+2
|
* Set Psych as the YAML engine for RubiniusRobin Dupret2014-07-231-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 branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-2/+4
|\ | | | | | | | | Conflicts: actionpack/test/abstract_unit.rb
| * Stop using mocha on app_rails_loader_testRafael Mendonça França2014-07-071-2/+4
| |
* | Merge pull request #16212 from ↵Rafael Mendonça França2014-07-181-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 Jones2014-07-181-3/+3
| | |
| * | Added additional help messaging when there's scaffolding being generated and ↵Jim Jones2014-07-171-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.