AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 22:58:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,498 Commits 34 Branches 105 Tags
e61bcf3d9d73bfa6109d97103ae24fa420f29e15
Commit Graph

28498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rafael Mendonça França
0b35a3aacc Merge pull request #10478 from cainlevy/patch-1 
use canonical #controller_path logic in controller test cases
Conflicts:
	actionpack/lib/action_controller/test_case.rb
 2013-05-06 22:19:46 -03:00
Rafael Mendonça França
fb90ce015f Merge pull request #10406 from greenriver/distance_of_time_rational 
Correct time_ago_in_words to handle situation where Fixnum#/ returns a Rational (thanks to mathn)
 2013-05-06 07:27:59 -07:00
Ben Tucker
5a6d9d5491 Merging in fix from #8222 2013-05-06 09:36:40 -04:00
Carlos Antonio da Silva
3c01a693d9 Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets 
Fix tests related to scaffolding generator with --assets=false switch
 2013-05-05 11:31:15 -03:00
Rafael Mendonça França
927a04da40 Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master 
Fixes Scaffold generator with --assets=false
Conflicts:
	railties/CHANGELOG.md

Conflicts:
	railties/CHANGELOG.md
	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
 2013-05-04 10:58:53 -03:00
Janko Marohnić
5519468523 Fix ActiveRecord::Store not tracking changes 2013-04-29 20:39:52 +02:00
Aaron Patterson
9d7a748a51 adding test for the symbol refs 2013-04-26 16:47:27 -07:00
Aaron Patterson
ba12ef6ae1 just clear the caches on clear! rather than replacing. fixes #10251 2013-04-17 11:36:08 -07:00
Aaron Patterson
03d071d3cf adding a test for root path in the app 2013-04-17 11:30:17 -07:00
Carlos Antonio da Silva
dddc093a1a Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygems 
Using secure source https://rubygems.org when generating new plugin with Rails 3.2
 2013-04-17 05:23:03 -07:00
Prathamesh Sonpatki
cd548d9283 Use secure source in generated Gemfile for creating new plugin. Closes #10245 2013-04-17 17:40:52 +05:30
Carlos Antonio da Silva
624428b278 Fix "Scaling Rails Screencasts" link in caching guide 
Closes #10241 [ci skip]
 2013-04-16 20:25:34 -03:00
Carlos Antonio da Silva
130f96c432 Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2 
3-2-stable documentation: the possibility to use a hash of hashes for nested attributes
 2013-04-13 15:11:26 -07:00
Alexey Muranov
efd86315a7 Document nested attributes as hash of hashes 
Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes).

Align indentation in comments.
 2013-04-13 13:56:09 +02:00
Rafael Mendonça França
68239487bf Merge pull request #10172 from senny/10098_backport 
Backport: Correctly parse bigint defaults in PostgreSQL
 2013-04-11 06:41:49 -07:00
Erik Peterson
a6d9e16e41 Correctly parse bigint defaults in PostgreSQL, Backpost #10098. 
Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
	activerecord/test/cases/schema_dumper_test.rb
 2013-04-11 10:11:18 +02:00
Aaron Patterson
536f316cd3 Merge branch '3-2-later' into 3-2-stable 
* 3-2-later:
  adding test for CVE
 2013-04-09 09:22:42 -07:00
Rafael Mendonça França
c9bd2022d4 Improve the changelog entry [ci skip] 2013-04-05 16:54:01 -03:00
Rafael Mendonça França
dbe25910fa Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fields 
Fix explicit names on multiple file fields
 2013-04-05 12:53:26 -07:00
Ryan McGeary
44a9aedd7b Fix explicit names on multiple file fields 
If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").

Fixes #9830
 2013-04-05 15:35:20 -04:00
Carlos Antonio da Silva
fe58853765 Fix typo in view name 
Introduced in 2c22376fe0
 2013-04-03 20:59:44 -03:00
Carlos Antonio da Silva
e252e0ffe1 Use 1.8 hash style in test views 
Introduced in 2c22376fe0
 2013-04-03 20:59:40 -03:00
Carlos Antonio da Silva
e59f3809ef Merge pull request #7792 from seejee/chained_scopes_preload_properly 
Fixes Issue #7490: Chained scopes will preload properly
 2013-04-03 15:43:59 -07:00
Chris Geihsler
453c7d6c47 Chained scopes will be preloaded properly. Fixes #7490 2013-04-03 18:41:12 -04:00
Dmitry Vorotilin
2c22376fe0 Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer 2013-04-02 10:36:23 -07:00
Carlos Antonio da Silva
060fca7897 Fix formatting and minor review in AP changelog 
Sentences starting with # are considered headings.
 2013-03-30 16:42:52 -03:00
Steve Klabnik
bac6928eef Add attr_accessible to the Getting Started Guide. 
This was brought up in #9995, but is only present in 3-2-stable, since
mass assignment is removed from Rails 4.
 2013-03-29 16:28:04 -07:00
Rafael Mendonça França
e06b4fab8e Removing explain support warning from the Railtie 
This is causing a regression since the Active Record Railtie is trying to
connect to the development database in the application boot.

See https://github.com/rails/rails/pull/6197#issuecomment-15199273
 2013-03-28 13:21:56 -03:00
Carlos Antonio da Silva
75d0a81ffe Merge pull request #9943 from fredwu/test_fix_for_74e59ea 
Fixed test failures on 1.8.7 caused by 74e59ea
 2013-03-26 19:43:14 -07:00
Fred Wu
dee5915aac Fixed test failures on 1.8.7 caused by 74e59ea 2013-03-27 11:29:37 +11:00
Rafael Mendonça França
df37c91745 Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable 
[Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly.
 2013-03-26 15:22:05 -07:00
Fred Wu
8bd56f0f7a Added changelog for 55e2954 2013-03-27 09:20:04 +11:00
Fred Wu
55e2954703 Don't reset inheritance_column when setting explicitly. 
This is backported from master (cdfcbc4).
 2013-03-27 09:12:31 +11:00
Jeremy Kemper
dbd26e92a7 Merge pull request #9899 from macksmind/backport_5808 
Backport #5808
 2013-03-24 13:19:20 -07:00
Mack Earnhardt
74e59ea8b6 Backport #5808 
df36c5f - Fix assert_template assertion with :layout option
4bd05a7 - Fix assert_template :layout => nil assertion
0d19a08 - Improve assert_template layout checking
 2013-03-24 08:16:26 -04:00
Jon Rowe
0c96169f59 test case to assert that associations do not overwrite after create, fixes #9310 2013-03-24 12:32:11 +13:00
Jon Leighton
029dd435e4 Merge pull request #9873 from senny/use_old_hash_syntax 
use ruby 1.8 Hash syntax [ci skip]
 2013-03-22 07:25:24 -07:00
Yves Senn
845cc5c78d use ruby 1.8 Hash syntax [ci skip] 2013-03-22 15:23:57 +01:00
Jon Leighton
ae2baab1aa Merge pull request #9870 from senny/9806_eager_loading_regression 
do not reset associations when preloading twice.
 2013-03-22 07:14:17 -07:00
Yves Senn
c8edd4fda4 do not reset associations when preloading twice. 
Closes #9806.

As the `through_options` always contained `{:order=>nil}` the second time,
the preloader ran, the association was always reset. This patch only
adds the `:order` to the `through_options` if it is set.
 2013-03-22 15:08:09 +01:00
Rafael Mendonça França
69599b63de Fix test to Ruby 1.8 
Pathname doesn't respond to to_path
 2013-03-21 09:33:22 -03:00
Rafael Mendonça França
afe5880fa6 Improve CHANGELOG entry [ci skip] 2013-03-21 09:16:48 -03:00
Aaron Patterson
d1577cfe3d Merge branch '3-2-stable' into fredwu-slow_view_loading_fix 
* 3-2-stable:
  Merge pull request #9802 from newsline/fix-broken-action-missing
  Remove bad changelog entry from AR [ci skip]
  Wrong exception is occured when raising no translatable exception
  Don't crash exception translation w/ nil result attribute.

Conflicts:
	actionpack/CHANGELOG.md
 2013-03-20 16:41:01 -07:00
Fred Wu
38d0647861 Added changelog for 687e68d 2013-03-21 09:26:07 +11:00
Rafael Mendonça França
2c8f349953 Merge pull request #9802 from newsline/fix-broken-action-missing 
Fix missing action_missing

Conflicts:
	actionpack/CHANGELOG.md

Conflicts:
	actionpack/test/controller/base_test.rb

Fixes #9799
 2013-03-20 18:22:31 -03:00
Carlos Antonio da Silva
7e8a74d401 Remove bad changelog entry from AR [ci skip] 
Introduced in dc2bc388bc.
 2013-03-20 12:09:56 -03:00
kennyj
dc2bc388bc Wrong exception is occured when raising no translatable exception 
Conflicts:
	activerecord/CHANGELOG.md
 2013-03-20 10:11:07 +00:00
Steve Jorgensen
be913c3964 Don't crash exception translation w/ nil result attribute. 
Exception.result is nil when attempting a query after PostgreSQL
disconnect, resulting in new exception:
NoMethodError: undefined method `error_field' for nil:NilClass
 2013-03-20 10:09:54 +00:00
Fred Wu
687e68d88f Fixed assets loading performance in 3.2.13 
The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten.

Fixes #9803
 2013-03-20 16:13:30 +11:00
Carlos Antonio da Silva
517060ab59 Be consistent with quotes in smtp example guide [ci skip] 2013-03-19 17:57:22 -03:00