| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Decode attributes pulled from URI.parse
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/connection_specification.rb
|
|
|
|
|
|
| |
Do not render views when mail() isn't called. (NullMail refactoring)
Conflicts:
actionmailer/CHANGELOG.md
|
|\
| |
| | |
Removing JSON for other ruby
|
|/
|
|
|
|
|
| |
It's only required for 1.8 and for JRuby!
I was fixing a bug with JSON pure on 1.8.7
and I found that we have included json for other
1.8 > rubies also.
|
|
|
|
| |
Fix AM::Serializers::Xml dependency
|
|\
| |
| | |
Adding a missing parenthesis in the doc of String#parameterize.
|
| | |
|
| | |
|
|\ \
| | |
| | | |
Fix behavior of `rake db:structure:load` for 3.2.8
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
`ENV['RAILS_ENV']` is not defined unless explicitly specified on the
command line when running `rake db:structure:load`. This patch lets
the rake task retrieve the environment from `Rails.env` which defaults
to "development".
|
| | |
| | |
| | |
| | |
| | | |
This will make possible to do a frameworkless initialization since the
the default middleware stack is self contained.
|
|\ \ \
| |/ /
|/| | |
backport: active_model/validations requires necessary files to run
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| | |
Dup'ed ActiveRecord objects may not share the errors object
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/cases/dup_test.rb
|
| |
| |
| |
| | |
Fixes #7955
|
|\ \
| | |
| | | |
Backport fix of issue #7914 to 3-2-stable
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changes:
* According to postgreSQL documentation:
(http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html)
we should not be using 'adsrc' field because this field is unaware of
outside changes that could affect the way that default values are
represented. Thus, I changed the queries to use
"pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field.
* Remove parsing of character type default values for 8.1 formatting since
Rails doesn't support postgreSQL 8.1 anymore.
* Remove misleading comment unrelated to code.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
PostgreSQL adapter properly parses default values when using multiple
schemas and domains.
When using domains across schemas, PostgresSQL prefixes the type of the
default value with the name of the schema where that type (or domain) is.
For example, this query:
```
SELECT a.attname, d.adsrc
FROM pg_attribute a LEFT JOIN pg_attrdef d
ON a.attrelid = d.adrelid AND a.attnum = d.adnum
WHERE a.attrelid = "defaults"'::regclass
AND a.attnum > 0 AND NOT a.attisdropped
ORDER BY a.attnum;
```
could return something like "'<default_value>'::pg_catalog.text" or
"(''<default_value>'::pg_catalog.text)::text" for the text columns with
defaults.
I modified the regexp used to parse this value so that it ignores
anything between ':: and \b(?:character varying|bpchar|text), and it
allows to have optional parens like in the above second example.
|
|\ \
| | |
| | | |
Fix has_many assocation w/select load after create
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you create a new record via a collection association proxy that has
not loaded its target, and which selects additional attributes through
the association, then when the proxy loads its target, it will
inadvertently trigger a deprecation notice during attribute writing when
CollectionAssociation#merge_target_lists attempts to do its thing, since
the newly loaded records will possess attributes the created record does
not.
|
|\ \
| | |
| | | |
Backport eager autoloading fixes
|
| | |
| | |
| | |
| | |
| | |
| | | |
Without eager autoloading, these would be autoloaded
only when #preloader_for is called, which is too late
in threaded applications.
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example:
# Tag asset requests so it's easy to filter them from dev logs
config.log_tags = [
-> request { :assets if request.path.starts_with?(config.assets.prefix) },
-> request { request.uuid }
]
# Watch the logs, ignoring asset requests
$ tail -100f log/development.log | grep -v assets
|
|\ \
| | |
| | | |
Accept :remote as symbol in link_to options (backport)
|
| | |
| | |
| | |
| | |
| | | |
Accept either :remote or 'remote' in both the html_options and
(url_)options hash arguments to link_to.
|
|/ / |
|
| |
| |
| |
| |
| |
| | |
can't pass :locals to #assert_template without a view test case (#3415)
Conflicts:
actionpack/CHANGELOG.md
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
senny/5920_postgres_adapter_table_with_capital_letters
postgres, quote table names when fetching the primary key (#5920)
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
|
| |
| |
| |
| | |
Count returns 0 without querying if parent is not saved
|
|\ \
| | |
| | | |
Update supported ruby versions error message in ruby_version_check.rb
|
|/ / |
|
| |
| |
| |
| |
| | |
Conflicts:
activerecord/lib/active_record/counter_cache.rb
|
| |
| |
| |
| |
| |
| |
| | |
Fix reset_counters crashing on has_many :through associations.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/counter_cache.rb
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
prefix TemplateAssertions ivars.
Closes #7459
Conflicts:
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_view/test_case.rb
|
| |
| |
| |
| | |
resource and resources do no longer modify passed options
|
| |
| |
| |
| |
| |
| |
| |
| | |
Master branch: Fixed generated whitespace in routes when using namespaced resource.
Merge pull request #7811 from iHiD/resource_generator_routes_master
Fix the build (Broken scaffold routes test)
|
| |
| |
| |
| | |
behavior added at c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb
|
| |
| |
| |
| | |
Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
|
|\ \
| | |
| | | |
Fix reference to code sample in Getting Started.
|
|/ /
| |
| |
| | |
Fixes #7799.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
REBASED: fixing assert_template bug when template matches expected, but not ends with
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_controller/test_case.rb
|
|\ \
| | |
| | | |
Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To test uploading a file without using fixture_file_upload, a posted
ActionDispatch::Http::UploadedFile should not be paramified (just like
Rack::Test::UploadedFile).
(Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
share the same API, tempfile is not accessible on
Rack::Test::UploadedFile as discussed in
https://github.com/brynary/rack-test/issues/30)
|
|\ \ \
| |/ /
|/| | |
backport 68677ffb8298105eb9d3efa26d928dd88cc5e006
|
| | | |
|
| | | |
|
|/ / |
|
| | |
|