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
Arun Agrawal
bd00feec4f
Test for when controller with skip-assets
2013-11-23 17:17:18 +01:00
Arun Agrawal
d4265021d0
Added test when task generator called on revoke
2013-11-23 17:04:30 +01:00
Yves Senn
8461b6eda4
Merge pull request #13011 from arunagw/jruby-fixes
...
Using activerecord-jdbcsqlite3-adapter
2013-11-23 02:59:27 -08:00
Arun Agrawal
ee4ab3fe52
Using activerecord-jdbcsqlite3-adapter
...
PluginGeneratorTest needs to have
activerecord-jdbcsqlite3-adapter to pass under JRuby
2013-11-23 11:41:27 +01:00
Arun Agrawal
9725bff2f6
Cleaned up app generator test
2013-11-23 10:41:15 +01:00
Rafael Mendonça França
34c08d2ead
Use a more generic assertion to make sure this tests will be useful.
...
Since we are using assert_no_match, if we change the code before
changing the tests, the tests will still pass and the assertion will
become useless
2013-11-22 14:53:31 -02:00
Lauro Caetano
5ba606e1c6
Fix the assertion for not inclusion of turbolinks on application.js.
...
We were asserting if `//= turbolinks` was not present while the correct is
asserting that `//= require turbolinks` is not present.
2013-11-22 10:49:41 -02:00
Carlos Antonio da Silva
18964368f3
Improve changelogs
...
Also make Action Mailer changelog format more consistent with the
others [ci skip]
2013-11-22 08:30:04 -02:00
Arun Agrawal
a6c06217a5
Build fix for new routing inspector changes
...
Broken by
6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
2013-11-22 08:51:12 +01:00
Lauro Caetano
c09ef94a49
Remove turbolinks when generating a new application based on a template
...
that skips it.
It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template.
2013-11-21 23:31:57 -02:00
Rafael Mendonça França
47229208fc
Merge pull request #12994 from sbagdat/fix_for_info_title
...
Fix for titles of info pages
2013-11-21 17:27:24 -08:00
Sıtkı Bağdat
cf863f466e
Fix for titles of info pages
...
Both `rails/info/properties` and `rails/info/routes` have same html
title attribute as *Routes*. This commit includes a fix for the titles.
2013-11-22 03:02:57 +02:00
Yves Senn
941516f225
Merge pull request #12975 from sbagdat/fix-for-rake-routes
...
Fix for routes task
2013-11-21 09:07:57 -08:00
Sıtkı Bağdat
6701b4cf41
Fix for routes task
...
This commit fixes formatting issue for `rake routes` task, when a section is shorter than a header.
2013-11-21 18:35:58 +02:00
Carlos Antonio da Silva
68aebd4895
Merge pull request #12970 from prathamesh-sonpatki/issue12885
...
Add positional information to eval call so that this information will be used in printing correct location where the exception occurred.
Closes #12885 .
2013-11-21 04:10:16 -08:00
Dmitriy Budnik
f1ffedb233
replace U+00A0 with whitespace
2013-11-21 13:25:16 +02:00
Prathamesh Sonpatki
26f8fb8641
Add positional information to eval call so that this information will
...
be used in printing correct location where the exception occurred.
Closes #12885
- Without this the location of exception is always the line on which
'eval' is called
- But if the exception occurs in a gem outside of Rails, then that
location is not printed in stacktrace
2013-11-20 22:48:08 +05:30