Guillermo Iguaran
c79fb2ac8f
Merge pull request #7980 from steveklabnik/issue_7979
...
Restore original remote_ip algorithm.
2013-01-02 15:27:20 -08:00
Andre Arko
75dcdbc84e
Restore original remote_ip algorithm.
...
Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We
remove trusted IP values, and then take the last given value, assuming that
it is the most likely to be the correct, unfaked value. See [1] for a very
thorough discussion of why that is the best option we have at the moment.
[1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/
Fixes #7979
2013-01-02 15:26:27 -08:00
Carlos Antonio da Silva
9f200fb296
Changelog improvements [ci skip]
2013-01-02 21:11:11 -02:00
Akira Matsuda
b6aa59368b
missing changelog entry for #8682
2013-01-02 19:19:33 -03:00
Rafael Mendonça França
ef61504c6e
Merge pull request #8697 from goshakkk/undup
...
Remove another unnecessary dup
2013-01-02 13:58:32 -08:00
Aaron Patterson
44930b2def
CVE-2012-5664 options hashes should only be extracted if there are extra parameters
...
Conflicts:
activerecord/lib/active_record/dynamic_matchers.rb
2013-01-02 13:44:06 -08:00
Rafael Mendonça França
8af674714c
Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash
...
do not append a second slash when using `trailing_slash: true`
2013-01-02 13:39:56 -08:00
Guillermo Iguaran
c9f0680cdf
Fixing closing </p>
2013-01-02 16:18:17 -05:00
Guillermo Iguaran
2db932da78
Merge pull request #8702 from rubys/master
...
Fix a number of validation/style errors
2013-01-02 13:12:38 -08:00
Sam Ruby
73f4f4aa8f
Fix a number of validation/style errors:
...
* <pre> is not allowed to be nested inside of <p> elements in HTML
* Indentation of </p> doesn't match corresponding <p>
* <p> element not explicitly closed
* One more </div> than <div>
In each case, the template was fixed to match how a HTML5 parser would "see"
the resulting page.
2013-01-02 16:06:54 -05:00
Yves Senn
0b2ce7d955
do not append a second slash when using
2013-01-02 21:11:16 +01:00
Aaron Patterson
8890fb8087
take into account multipart when calculating tag attributes
2013-01-02 11:52:23 -08:00
Aaron Patterson
497c4bbd47
ask the form builder for form tag attributes
2013-01-02 11:19:42 -08:00
Aaron Patterson
b934034820
do not mutate the options hash (when we do not need to)
2013-01-02 11:14:14 -08:00
Gosha Arinich
8ef780c3e2
remove another unnecessary dup
2013-01-02 19:29:50 +03:00
Carlos Antonio da Silva
bdaafae550
Merge pull request #8694 from goshakkk/undup
...
Remove unnecessary #dup
2013-01-02 07:48:03 -08:00
Guillermo Iguaran
6e475a04bd
Merge pull request #8688 from goshakkk/error-page-toggle
...
Allow toggling dumps on error page
2013-01-02 07:35:53 -08:00
Gosha Arinich
aca0c6d315
remove unnecessary #dup
2013-01-02 18:33:52 +03:00
Rafael Mendonça França
f83b6ed983
Merge pull request #8693 from goshakkk/flatten
...
Replace #flatten with Array()
2013-01-02 07:10:43 -08:00
Rafael Mendonça França
08db381d15
Merge pull request #8692 from lucasmazza/error-page-css
...
Cleanup the CSS on the new error page.
2013-01-02 07:06:23 -08:00
Gosha Arinich
7c1af53b1c
replace #flatten with Array()
2013-01-02 18:03:23 +03:00
Rafael Mendonça França
1fd7971af7
Merge pull request #8691 from acapilleri/preload_association
...
refactoring to_sym of Symbol in preload
2013-01-02 07:00:56 -08:00
Lucas Mazza
ed8122c1d1
Cleanup some unnecessary CSS on the new error page and reformat some lines.
2013-01-02 12:59:02 -02:00
Angelo capilleri
0a9172f190
refactoring to_sym of Symbol in preload
2013-01-02 15:57:01 +01:00
Rafael Mendonça França
fb61a80eae
Merge pull request #8689 from goshakkk/error-page
...
Add source code left padding on error pages
2013-01-02 06:15:15 -08:00
Gosha Arinich
30f86ea24a
add source line padding
2013-01-02 17:03:57 +03:00
Gosha Arinich
bb932d5e98
allow toggling dumps instead of just showing
2013-01-02 16:12:51 +03:00
Rafael Mendonça França
6a38befd51
No need to pass a empty block to content_tag_for anymore
2013-01-02 09:53:51 -03:00
Rafael Mendonça França
7e2ef18b51
Make content_tag_for work without block
...
This is version of #8640 for master
2013-01-02 09:17:54 -03:00
Xavier Noria
51ab77e9ba
Merge pull request #8686 from mekishizufu/changelog_entry
...
Add missing changelog entry for #8676 [ci skip]
2013-01-02 02:48:15 -08:00
Jiri Pospisil
fc7b8d38c1
Add missing changelog entry for #8676 [ci skip]
2013-01-02 11:41:35 +01:00
Guillermo Iguaran
e443ac03a4
Merge pull request #8682 from amatsuda/rm_as_frozen_object_error
...
remove meaningless AS::FrozenObjectError
2013-01-01 20:56:35 -08:00
Akira Matsuda
7bc224dda0
remove meaningless AS::FrozenObjectError
2013-01-02 10:04:58 +09:00
Rafael Mendonça França
bb38df89bf
Standardize the use of current_adapter?
2013-01-01 19:18:34 -03:00
Rafael Mendonça França
baf8e34697
Merge pull request #8678 from yahonda/remove_column_oracle
...
Address a failure test_remove_column_with_multi_column_index with Oracle
2013-01-01 14:08:53 -08:00
Yasuo Honda
e7ff765e11
Address a failure test_remove_column_with_multi_column_index with Oracle database
...
Not only PostgreSQL, Oracle database adapter drops the multi-column index
if any of the indexed columns dropped by remove_column.
2013-01-02 07:04:37 +09:00
Rafael Mendonça França
e333d64f3d
Merge pull request #8677 from amatsuda/unused_scope_in_test_models
...
unused scope in AR test model
2013-01-01 13:57:18 -08:00
Akira Matsuda
542d6b5e28
unused scope
2013-01-02 05:48:56 +09:00
Guillermo Iguaran
5f638161f7
Add entry in Releases Notes about changes in exceptions page
2013-01-01 14:14:58 -05:00
Guillermo Iguaran
c113a2f0f6
Add CHANGELOG entry for changes in exception pages
2013-01-01 13:29:04 -05:00
Vijay Dev
ed28e6c9f2
update rake tasks output [ci skip]
2013-01-01 23:43:00 +05:30
Vijay Dev
d888dff8c5
fix alignment in rails info properties page [ci skip]
2013-01-01 23:43:00 +05:30
José Valim
44ea013a42
Merge pull request #8676 from mekishizufu/skip_bundle_alias
...
Add -B alias for --skip-bundle
2013-01-01 09:49:52 -08:00
Jiri Pospisil
47e52a6ce3
Add -B alias for --skip-bundle
2013-01-01 18:46:19 +01:00
José Valim
7c6246bbf0
Merge pull request #8675 from goshakkk/cleanup
...
Remove unnecessary always-nil var from #compact
2013-01-01 09:40:53 -08:00
Gosha Arinich
fb58c0ed4a
remove unnecessary always-nil var from #compact
2013-01-01 20:35:43 +03:00
Vijay Dev
684511825d
small fix in js guide [ci skip]
2013-01-01 22:45:55 +05:30
Guillermo Iguaran
c684125833
Fix indent in UnknownAction template
2013-01-01 11:57:22 -05:00
Vijay Dev
dfc930b2b1
Merge branch 'master' of github.com:lifo/docrails
2013-01-01 20:29:43 +05:30
Vijay Dev
a30eae10e4
copy edits [ci skip]
2013-01-01 20:28:34 +05:30