Commit Graph

4663 Commits

Author SHA1 Message Date
Rafael Mendonça França
e2066818e8 Point to right sass-rails version 2014-08-19 21:58:05 -03:00
Guillermo Iguaran
35b2d3f56c Use web-console 2.0.0.beta2 on new apps 2014-08-19 19:39:29 -05:00
Rafael Mendonça França
43073b393d Revert "Improve custom configuration"
This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336.

Conflicts:
	railties/lib/rails/railtie/configuration.rb

It added regression. Will be back after the beta
2014-08-19 19:41:15 -03:00
Rafael Mendonça França
299c264552 We always get the value so no need to check nil or Hash 2014-08-19 17:38:29 -03:00
Rafael Mendonça França
091645116b Use released rails-html-sanitizer 2014-08-19 16:47:26 -03:00
Rafael Mendonça França
24bb8347b6 Merge pull request #16563 from arthurnn/add_ar_raise_trans_option
Add default .raise_in_transactional_callbacks option to template
2014-08-19 16:19:36 -03:00
Rafael Mendonça França
b8ef1d8abd loofah require dependecy is not needed anymore 2014-08-19 16:15:41 -03:00
Arthur Neves
c7c2df2c63
Add default .raise_in_transactional_callbacks option to template 2014-08-19 13:56:55 -04:00
Rafael Mendonça França
de4891344c Improve custom configuration
1. Hashes can be assigned
2. We don't need a special level anymore

The method chain only works in the top level.

If users need a second level they need to assign a OrderedOptions to the
key:

    config.resque.server = ActiveSupport::OrderedOptions.new
    config.resque.server.url = "http://localhost"
    config.resque.server.port = 3000

[Rafael Mendonça França + Carlos Antonio da Silva]
2014-08-19 13:59:22 -03:00
Rafael Mendonça França
ec7a8b0649 Rack is released too 2014-08-18 16:14:01 -03:00
Rafael Mendonça França
8292cdb50e No need to point to arel and i18n master anymore 2014-08-18 15:59:03 -03:00
Jon Atack
ff39a975a7 Fix rails-html_sanitizer in Gemfile template
[skip ci]
2014-08-18 11:03:37 +02:00
Rafael Mendonça França
76883f9237 Merge pull request #16062 from sgrif/sg-required-generators
Add a `required` option to the model generator
2014-08-17 22:57:21 -03:00
Rafael Mendonça França
c78da4d5c4 Merge branch 'master' into loofah
Conflicts:
	actionpack/CHANGELOG.md
2014-08-17 22:38:22 -03:00
Rafael Mendonça França
4e49134621 Use the release gems and point application gemfile to right loofah 2014-08-17 22:34:44 -03:00
Rafael Mendonça França
eced6f8118 Merge pull request #16294 from bf4/code_tools
Update, unify, encapsulate, and fix various code tools in Rails
2014-08-17 22:12:23 -03:00
David Heinemeier Hansson
5d2de5c3b8 Merge branch 'master' of github.com:rails/rails 2014-08-17 16:54:26 -07:00
David Heinemeier Hansson
49c9f850fa Merge pull request #16485 from seuros/activejob
Integrate ActiveJob / DeliverLater / GlobalID with Rails
2014-08-17 16:44:30 -07:00
David Heinemeier Hansson
c20c86ee9e Dont encourage people to run without autoflush in production 2014-08-17 16:40:41 -07:00
Genadi Samokovarov
07ca1d3ab6 Lock web-console to 2.0.0.beta1 for the first 4.2 beta
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.
2014-08-18 02:03:58 +03:00
Godfrey Chan
beff925c32 Merge pull request #16467 from strzalek/cookies-digest-config-option2
Cookies digest config option (pt. 2)

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_dispatch/middleware/cookies.rb
2014-08-17 11:23:14 -07:00
Kasper Timm Hansen
1e2ffe7ae6 Prepare for partial release.
- Default to Rails::DeprecatedSanitizer in ActionView::Helpers::SanitizeHelper.
- Add upgrade notes.
- Add sanitizer to new applications Gemfiles.
- Remove 'rails-dom-testing' as a dependency.
2014-08-17 19:25:47 +02:00
Cristian Bica
b2cabb7ace Added docs for AJ::Callbacks; Added AJ to docs build map 2014-08-16 01:31:39 +03:00
Akira Matsuda
2cc1a64579 s/Dont'/Don't/ 2014-08-15 13:59:05 +09:00
Łukasz Strzałkowski
29be3f5d83 Add config option for cookies digest
You can now configure custom digest for cookies in the same way as `serializer`:

  config.action_dispatch.cookies_digest = 'SHA256'
2014-08-12 21:57:51 +02:00
Abdelkader Boudih
0c232779ec Remove activejob integration tests 2014-08-12 10:07:21 +00:00
Santiago Pastorino
d70ba48c4d Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"
This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing
changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699.

IT BROKE THE BUILD!!!
2014-08-08 18:20:33 -03:00
Santiago Pastorino
7059776205 Merge pull request #16434 from strzalek/cookies-digest-config-option
Add digest config option for SignedCookiesJar
2014-08-08 18:05:53 -03:00
Łukasz Strzałkowski
629f4e007c Return preconfigured AS::MessageVerifier 2014-08-08 21:24:02 +02:00
Łukasz Strzałkowski
cfbedd3479 Add config option for cookies digest
You can now configure custom digest for cookies in the same way as `serializer`:

config.action_dispatch.cookies_digest = \SHA256'
2014-08-08 21:20:27 +02:00
Aaron Patterson
dde91e9bf5 save a hash allocation per request. 2014-08-08 11:41:54 -07:00
Arun Agrawal
301b5fd522 Fixes test for Gemfile entry changes
Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c
2014-08-08 19:50:25 +02:00
Sean Griffin
fdfc0fc6c9 Add a required option to the model generator
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.
2014-08-08 10:29:27 -06:00
David Heinemeier Hansson
fbe38c9e9d Pull spring gem entry into the Gemfile template instead of gemfile_entries so it can be grouped with the other development tools 2014-08-07 16:34:27 -07:00
David Heinemeier Hansson
089661b69a Merge branch 'master' of github.com:rails/rails 2014-08-07 16:10:20 -07:00
David Heinemeier Hansson
cc1de71bfa Stop using padding in the generated Gemfile -- it looks shit 2014-08-07 16:10:14 -07:00
Aaron Patterson
8121eefc22 add a new constructor that runs load hooks 2014-08-07 15:50:46 -07:00
Aaron Patterson
2296989826 defer running after_config hooks until after the object is allocated 2014-08-07 15:28:53 -07:00
Aaron Patterson
d25fe31c40 lazily instantiate application subclasses
this means we can meaningfully override methods in the subclass
2014-08-06 18:27:16 -07:00
Yves Senn
a819211984 Merge pull request #16359 from skanev/after-bundle-in-rails-templates
Add an after_bundle callback in Rails templates

Conflicts:
	railties/CHANGELOG.md
2014-08-06 08:49:00 +02:00
José Valim
e5e4d08450 Bring back the helpers tests
Also keep the hook as other tools may rely on it,
we just don't do anything by default on Rails.
2014-08-05 14:04:30 +02:00
Jon Atack
9794e74977 Fix typo [ci skip] 2014-08-04 19:19:26 +02:00
David Heinemeier Hansson
3d70f0740b Explain why we use asset digests, not what a setter does 2014-08-03 16:02:32 -07:00
David Heinemeier Hansson
5132f8383c Add suggestion as to how you can app the the assets load path 2014-08-03 15:55:22 -07:00
David Heinemeier Hansson
611849772d Pull in the custom configuration concept from dhh/custom_configuration 2014-08-03 15:48:14 -07:00
David Heinemeier Hansson
e5632f37f7 A few more tests asserting the presence of helper test stubs 2014-08-03 15:12:27 -07:00
David Heinemeier Hansson
58ce115fa5 Change the production log level default from :info to :debug. All production 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 2014-08-03 14:57:43 -07:00
David Heinemeier Hansson
a34b6649d0 Generating stubs for helper tests is overly specific. Most helpers should 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 2014-08-03 14:50:50 -07:00
Stefan Kanev
097b210189 Add an after_bundle callback in Rails templates
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.
2014-08-03 00:29:29 +02:00
@schneems and @sgrif
2bbcca004c Deprecate *_path methods in mailers
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
2014-07-30 12:01:45 -05:00