TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
38,237 Commits 2 Branches 0 Tags 294 MiB
d9a0e0d853
Commit Graph

38237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yves Senn
d9a0e0d853 remove trailing whitespace from config/routes.rb template. 2013-06-26 12:06:55 +02:00
Yves Senn
16caf63d32 Merge pull request #11109 from wangjohn/moving_pluck_and_ids_to_new_delegate_line 
Moving the `pluck` and `ids` methods to their own delegate line.
 2013-06-25 22:32:54 -07:00
wangjohn
36c89664f5 Moving the pluck and ids methods to their own delegate line. 
These two methods aren't really statistical helper methods and don't
really belong in any other group which is being delegated for querying,
so I'm moving them to their own group of methods.

I've also changed the `:to => :all` hash syntax to `to: :all`.
 2013-06-25 21:40:58 -07:00
Carlos Antonio da Silva
96a083b51e Fix @tenderlove's name in changelog ✨ 
[ci skip]
 2013-06-26 00:57:19 -03:00
Carlos Antonio da Silva
9218770daa Merge pull request #10542 from waseem/remove_require 
Remove unnecessary require from active_support/inflector/methods.rb
 2013-06-25 17:57:10 -07:00
Carlos Antonio da Silva
61346d1b42 Merge pull request #10774 from chuckbergeron/validates-inclusion-of-accuracy-for-non-numeric-ranges 
Greater accuracy for validates_inclusion_of on non-numeric ranges

Closes #10774, fixes #10593
 2013-06-25 21:48:41 -03:00
Carlos Antonio da Silva
a1fedfa839 Merge pull request #10627 from vipulnsward/destructive_symbolize 
Change to destructive `deep_symbolize_keys` to avoid a new hash creation.
 2013-06-25 17:38:43 -07:00
Carlos Antonio da Silva
51a5e90658 Merge pull request #10666 from YanhaoYang/master 
Make "rails dbconsole" work with activerecord-postgis-adapter
 2013-06-25 17:34:20 -07:00
Carlos Antonio da Silva
37bacd3df2 Merge pull request #10730 from tkhr/add_test_for_AR__CounterCache#update_counters 
Add test for AR::CounterCache.update_counters
 2013-06-25 17:29:33 -07:00
Carlos Antonio da Silva
dfafac9dfe Add changelog entry for database tasks removal #10853 [ci skip] 2013-06-25 20:58:43 -03:00
Carlos Antonio da Silva
370e1ad3f1 Merge pull request #10853 from kennyj/deprecated-database_tasks 
Remove Oracle / Sqlserver / Firebird database tasks were deprecated since 4.0.
 2013-06-25 16:56:39 -07:00
Carlos Antonio da Silva
32dd37b65a Merge branch 'cache-fragment-refactor' 
Closes #10819
 2013-06-25 20:52:12 -03:00
Carlos Antonio da Silva
f410c13bf8 Refactor cache fragment handling with read/write methods 2013-06-25 20:51:02 -03:00
Andrew Rove
f341acdae3 Move the write portion of fragment_for to its own method to allow for easier creation of custom cache methods. 2013-06-25 20:46:02 -03:00
Carlos Antonio da Silva
840c552047 Merge pull request #10992 from Empact/find-each-enumerator 
When .find_each is called without a block, return an Enumerator.
 2013-06-25 20:09:17 -03:00
Carlos Antonio da Silva
755069ee4e Merge pull request #10993 from Empact/result-each-enumerator 
Change Result#each to return an Enumerator when called without a block.
 2013-06-25 20:07:59 -03:00
Carlos Antonio da Silva
a1bcf1fb92 Merge pull request #11105 from mariozig/correct-documentation 
Fix typo in docs. HABTM associations should use a pluralized name [ci skip]
 2013-06-25 15:53:11 -07:00
mariozig
bf044a9bbe Fix typo in docs. HABTM associations should use a pluralized name 2013-06-25 15:35:03 -07:00
Carlos Antonio da Silva
dd9d869746 Merge pull request #11000 from sbeckeriv/accept_header 
Fix undefined method `ref' for nil:NilClass for bad accept headers
 2013-06-25 19:34:20 -03:00
Carlos Antonio da Silva
f02d4ddc99 Merge pull request #11046 from arunagw/verbose_mode_on 
Verbose mode on when running tests
 2013-06-25 15:15:43 -07:00
Carlos Antonio da Silva
364500d905 Merge branch 'error-explanation' 
Closes #11077 [ci skip]
 2013-06-25 19:08:12 -03:00
Carlos Antonio da Silva
7438e2fa83 Fix another "error_explanation" css class in guides [ci skip] 2013-06-25 19:07:49 -03:00
Luzi Humm
1238b5dc02 change id="errorExplanation" to id="error_explanation" to match the generated files 2013-06-25 19:07:49 -03:00
Carlos Antonio da Silva
7451bfc5a7 Merge pull request #11096 from akalyaev/remove-unnecessary-mapping 
removed unnecessary mapping for on options
 2013-06-25 15:00:03 -07:00
Xavier Noria
da8cb2acc4 Merge pull request #11095 from vipulnsward/rails_4_docs 
We are now rails 4
 2013-06-25 14:34:12 -07:00
Rafael Mendonça França
34e48168be Merge pull request #11098 from vredniy/master 
Fixed menu section's location (guides)
 2013-06-25 11:44:24 -07:00
Rafael Mendonça França
b8e305d9ed Merge pull request #11097 from ryancw/patch-2 
ActionView flows comment typo
 2013-06-25 11:39:27 -07:00
Dima Zudochkin
8067dbea33 Fixed menu section's location (guides) 2013-06-25 22:35:19 +04:00
Ryan Williams
7acbe60328 Comment typo 2013-06-25 14:34:51 -04:00
Anton Kalyaev
512f03e740 removed unnecessary mapping for on options 
Right before that in `assert_valid_transaction_action` method we make
sure that `options[:on]` contains values from `ACTIONS` array
(`[:create, :destroy, :update]`) and nothing more (i.e. it could not
contain strings or something else, otherwise the error is raised).

Also I've polished some docs.
 2013-06-25 22:31:14 +04:00
Vipul A M
988a2a8b6e We are now rails 4 [skip-ci] 2013-06-26 00:01:04 +05:30
Rafael Mendonça França
7eaf90a7ab Merge pull request #11093 from nolman/restoring-scaffold-generation 
restore correct scaffold generation
 2013-06-25 10:39:48 -07:00
Nolan Evans
e17ddc255d restore correct scaffold generation 2013-06-25 10:32:58 -07:00
Steve Klabnik
0c850f8dab Change reference to all to scoped instead. 
In #11088, `#to_a` was added to remove a deprecation around using
`#all`. I merged, but it really should have been `#scoped` instead, as
that's the preferred replacement.
 2013-06-25 10:16:30 -07:00
Steve Klabnik
34d6708be8 Merge pull request #11088 from nolman/nolman/scaffold-fix 
fix deprecation warning in scaffold controllers
 2013-06-25 10:01:30 -07:00
Nolan Evans
e84edf13c2 fix deprecation warning in scaffold controllers 2013-06-25 08:19:21 -07:00
Yves Senn
79abf07be8 Merge pull request #11084 from arkiver/master 
Fixing issue  #11083
 2013-06-25 04:20:55 -07:00
Akshay Khole
444d3412b9 Fixing Issue #11083 
Removing other occurrences of `the` appearing twice
 2013-06-25 16:47:29 +05:30
Yves Senn
aaad6b6e13 remove trailing whitespace from Active Record CHANGELOG 2013-06-25 10:12:10 +02:00
Andrew White
e1e7888fbc Clarify what arguments are passed to redirect blocks - fixes #11056 2013-06-25 07:01:01 +01:00
Andrew White
37b4276dbf Fix shorthand routes where controller and action are in the scope 
Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
shorthand syntax (i.e. endpoint is inferred from the the path).

Fixes #9856
 2013-06-25 06:04:26 +01:00
Yves Senn
55d9176b4a test-case => failing 2013-06-25 05:52:07 +01:00
Guillermo Iguaran
d6bc2fa5a9 Merge pull request #11069 from ykzts/actiondispatch-ssl-secure-flag-igonore-case 
Flag cookies as secure with ignore case in ActionDispatch::SSL
 2013-06-24 14:24:03 -07:00
Guillermo Iguaran
a6dd2ed4af Merge pull request #11065 from gbuesing/hstsfix 
ActionDispatch:SSL: don't include STS header in non-https responses
 2013-06-24 14:20:40 -07:00
Rafael Mendonça França
035e2976d0 Add CHANGELOG entry for #10971 
[ci skip]

Conflicts:
	actionpack/CHANGELOG.md
 2013-06-24 16:21:54 -03:00
Yves Senn
359a219664 Merge pull request #11075 from vipulnsward/remove_record 
Remove `another_contract` as it isn't being used
 2013-06-24 08:38:08 -07:00
Vipul A M
9d474d4885 Fix another_contract not being used warning 2013-06-24 21:05:04 +05:30
Yamagishi Kazutoshi
891fd78cd7 Flag cookies as secure with ignore case in ActionDispatch::SSL 2013-06-24 18:01:30 +09:00
Jared Armstrong
f6cdc2282f test-case to prevent regressions described in #10901. 2013-06-24 08:52:08 +02:00
Guillermo Iguaran
c0714a969d Merge pull request #11067 from rajars2576/fix_older_rocket 
replace all older rocket sign to new ":" from examples of active record ...
 2013-06-23 22:50:55 -07:00