Andrew White
d6dec7fcb6
Add mailer previews feature based on mail_view gem
2013-12-17 03:58:35 +00:00
Andrew White
1602a70fb4
Add an application controller for internal controllers
2013-12-17 03:58:35 +00:00
Andrew White
9d9f4dac06
Fix method redefinition warning
2013-12-17 03:58:34 +00:00
Yves Senn
bd66532ae4
Merge pull request #13328 from teohm/dbconsole_support_database_url
...
Fixed rails dbconsole to support DATABASE_URL
2013-12-16 02:37:01 -08:00
Huiming Teo
971d5107cd
fixed rails dbconsole to support ENV['DATABASE_URL'].
2013-12-16 18:31:49 +08:00
Arthur Neves
2648819ef1
Regression test for load_structure and clone_structure
2013-12-14 18:00:17 -05:00
Guillermo Iguaran
eed8c85f4b
Merge pull request #13298 from rails/secret_tokens
...
Create config/secrets.yml file for store of tokens
2013-12-13 09:48:34 -08:00
Guillermo Iguaran
c1f4bc2628
Add comment about secret_key_base in secrets.yml
2013-12-13 12:47:37 -05:00
DV Suresh
8ffe2f0d77
Correct comment in databases/postgresql.yml
2013-12-12 21:40:41 -06:00
Guillermo Iguaran
bb7537bc87
Rename tokens.yml to secrets.yml
2013-12-12 17:05:52 -05:00
Guillermo Iguaran
39fd0be766
Add test for custom tokens stored in config/tokens.yml
2013-12-12 14:59:11 -05:00
Guillermo Iguaran
4043147792
Replace config.secret_key_base with secrets.secret_key_base in test
2013-12-12 14:59:11 -05:00
Guillermo Iguaran
3eaa29840b
Load secret_key_base from tokens.yml, fallback to config.secret_key_base
2013-12-12 14:59:11 -05:00
Guillermo Iguaran
0f4d235c16
Remove secret_token.rb
2013-12-12 14:59:11 -05:00
Guillermo Iguaran
cb0fbbeac8
Add config/tokens.yml template
2013-12-12 14:59:11 -05:00
Santiago Pastorino
b5c5121f67
Revert "Rename not Ruby files to .tt"
...
This reverts commit bd360ad3c1d59273bf96ea01b17cf04285816dc2.
Reverting this for now until we fix the Thor related issue
2013-12-10 18:05:13 -02:00
Santiago Pastorino
bd360ad3c1
Rename not Ruby files to .tt
2013-12-10 13:50:57 -02:00
Arun Agrawal
f1a05e741d
Skipping debugger from plugin Gemfile for JRuby
2013-12-06 16:48:28 +01:00
Rafael Mendonça França
3fcbc7ad32
Merge branch 'av-loading-order'
2013-12-05 19:02:55 -02:00
Rafael Mendonça França
59f6b99fc3
Assert the singleton instead of to truthy/falsy
...
This will avoid false positives where caching? is nil and should be
false
2013-12-05 16:30:44 -02:00
Rafael Mendonça França
ff08d31e2e
Add tests to cache_template_loading when an engine loaded Action View
...
before the application
This test is a regression test to
b068e20b35797aa6deaa377a48c990759734f515 that changed the load order of
Action View initializers.
2013-12-05 16:25:30 -02:00
Arun Agrawal
647d4fd789
Make sure that spring is loaded in development only
2013-12-05 18:19:17 +01:00
Jeremy Kemper
5086c8c211
Merge pull request #13189 from strzalek/retain-ap-av-dep
...
Retain ActionPack dependency on ActionView. Fixes #12979 .
2013-12-05 07:25:17 -08:00
Yves Senn
73b57a515f
set i18n.enforce_available_locales
before i18n.default_locale
.
2013-12-05 13:19:51 +01:00
Carlos Antonio da Silva
d6eda3ef3c
Remove missing integration points of AV extraction
2013-12-05 11:39:56 +01:00
Yves Senn
64c784f553
end sentences with a .
. [ci skip]
2013-12-05 11:33:12 +01:00
Rafael Mendonça França
48c703b055
Make salt argument required for message verifier
2013-12-04 23:11:42 -02:00
Rafael Mendonça França
d3d8498867
Fix typos
2013-12-04 22:56:48 -02:00
Rafael Mendonça França
d16e22478d
Test if two different verifiers don't share the same secret
2013-12-04 22:56:48 -02:00
Rafael Mendonça França
9d86f6ce6e
Don't need to use a controller to test the verifier
2013-12-04 22:56:48 -02:00
Rafael Mendonça França
f98bd42854
No need to configure salts
2013-12-04 22:56:48 -02:00
Rafael Mendonça França
2be4916e8e
Make possibile to get different message verifiers
2013-12-04 22:56:47 -02:00
Rafael Mendonça França
0a2d004ba1
Add missing require
2013-12-04 22:56:47 -02:00
Rafael Mendonça França
609c217628
Rename verifier to message_verifier
2013-12-04 22:56:47 -02:00
Rafael Mendonça França
69ac53cfec
Add documentation and CHANGELOG entry to Application#verifier
2013-12-04 22:56:47 -02:00
Rafael Mendonça França
233001749c
Add application verifier
...
It is an application global verifier that can be used to generate and
verify signed messages.
See the documentation of ActiveSupport::MessageVerifier for more
information.
2013-12-04 22:55:47 -02:00
Jon Leighton
df50e3064a
Install Spring preloader when generating new applications
2013-12-03 23:07:40 +00:00
Xavier Noria
d362ee17db
Merge pull request #13117 from akshay-vishnoi/typo
...
Typo and grammatical fixes [ci skip]
2013-12-02 06:17:09 -08:00
Akshay Vishnoi
ef0f633c66
Typo and grammatical fixes [ci skip]
2013-12-02 19:35:02 +05:30
Guillermo Iguaran
2e296c8ee5
Merge pull request #12365 from jbaudanza/reorder
...
Move Rack::Cache after ActionDispatch::Static in the middleware stack
2013-12-01 22:42:26 -08:00
Prathamesh Sonpatki
4816fdd385
Use .railsrc while creating new plugin if available
...
- Fixes #10700
2013-12-01 20:47:15 +05:30
Guillermo Iguaran
d30cf963eb
config.assets.enabled isn't used anymore to disable Rails asset pipeline
2013-12-01 02:18:35 -05:00
Guillermo Iguaran
e898baa553
Honor to RAILS_GROUPS env variable while loading gems with Bundler
2013-12-01 02:12:25 -05:00
Carlos Antonio da Silva
3bc9c35707
Merge pull request #13111 from akshay-vishnoi/typo
...
Typo fixes [ci skip]
2013-11-30 07:25:00 -08:00
Akshay Vishnoi
e0326f56b4
Typo fixes [ci skip]
2013-11-30 20:27:01 +05:30
Arun Agrawal
3338f70608
Fixes failing test for JRuby
...
in JRuby FileUtils do not change
current dir when moving files
2013-11-29 17:08:36 +01:00
Yves Senn
2be3694964
Merge pull request #13104 from christophemaximin/fix_robots_txt_link
...
Fix URL to robots.txt documentation [ci skip]
2013-11-29 07:06:57 -08:00
Christophe Maximin
9c7eb40858
Fix URL to robots.txt documentation
2013-11-29 10:56:30 -04:00
Arun Agrawal
69bc21404c
Checking no debugger on JRuby
...
fixes tests for JRuby
2013-11-29 13:58:08 +01:00
Xavier Noria
17c29a0df0
Merge remote-tracking branch 'docrails/master'
...
Conflicts:
activesupport/lib/active_support/core_ext/hash/deep_merge.rb
activesupport/lib/active_support/core_ext/hash/keys.rb
2013-11-24 20:00:24 +01:00