aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21954 from xtian/patch-1Matthew Draper2015-10-141-4/+6
|\ | | | | Fix formatting of ActiveRecord PostgreSQL guide.
| * Fix formatting of ActiveRecord PostgreSQL guide.Christian Wesselhoeft2015-10-131-4/+6
|/
* Merge pull request #19135 from yuki24/access-control-supportJeremy Daer2015-10-138-22/+106
|\ | | | | | | Add basic support for access control headers to ActionDispatch::Static
| * Add the ability of returning arbitrary headers to ActionDispatch::StaticYuki Nishijima2015-06-138-22/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now ActionDispatch::Static can accept HTTP headers so that developers will have control of returning arbitrary headers like 'Access-Control-Allow-Origin' when a response is delivered. They can be configured through `#config.public_file_server.headers`: config.public_file_server.headers = { "Cache-Control" => "public, max-age=60", "Access-Control-Allow-Origin" => "http://rubyonrails.org" } Also deprecate `config.static_cache_control` in favor of `config.public_file_server.headers`.
* | Merge pull request #21952 from headius/only_one_module_for_deprecationMatthew Draper2015-10-141-4/+4
|\ \ | | | | | | Only prepend a single module when defining deprecation wrappers.
| * | Only prepend a single module when defining deprecation wrappers.Charles Oliver Nutter2015-10-131-4/+4
|/ / | | | | | | | | I could not find any reason why each method got its own prepended module here, and all tests appear to pass with my change.
* | `private def` breaks RDoc. Move meathod to preserve the docs.Yves Senn2015-10-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | The rdoc parser seems to trip on the `private def` construct. Public methods following a method defined with `private def` are not visible inside the module docs but are appended to the top-most module. For example the method `ActiveRecord::QueryMethods#distinct` was listed under `ActiveRecord#distinct`. /cc @sgrif
* | docs, :nodoc: `FromClause`, `QueryAttribute` and `WhereClauseFactory`.Yves Senn2015-10-133-3/+3
| | | | | | | | [ci skip]
* | docs, add missing `:nodoc: for `Associations::Builder`. [ci skip]Yves Senn2015-10-137-9/+9
| | | | | | | | | | | | This class is only used internally. We should keep it out of public documentation. This patch adds nodoc for `ActiveRecord::Associations::Builder` and everything nested within.
* | nodoc `ActiveRecord::ForeignAssociation`. [ci skip]Yves Senn2015-10-131-1/+1
| |
* | document `EagerLoadPolymorphicError`. [ci skip]Yves Senn2015-10-131-2/+4
| | | | | | | | | | | | | | | | | | This error is raised in certain situations when eager loading polymorphic associations. We even mention it in our docs. It should be included in our API. Conflicts: activerecord/lib/active_record/associations.rb
* | nodoc `ActiveRecord::Attribute::UserProvidedDefault`. [ci skip]Yves Senn2015-10-131-1/+1
| |
* | docs, recognize code examples as Ruby in `Relation::QueryMethods` [ci skip]Yves Senn2015-10-131-33/+37
| | | | | | | | | | | | | | | | Also unify the format of code example output. Only use `# =>` if the actual return value is described. Otherwise simply use `#`. Conflicts: activerecord/lib/active_record/relation/query_methods.rb
* | docs, nodoc internal Active Record `DelegateCache`. [ci skip]Yves Senn2015-10-131-3/+3
| |
* | docs, fix highlighting for code examples in calculations.rb [ci skip]Yves Senn2015-10-131-20/+20
| |
* | `:to_table` when adding a fk through `add_reference`.Yves Senn2015-10-134-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | Closes #21563. The `name` argument of `add_references` was both used to generate the column name `<name>_id` and as the target table for the foreign key `name.pluralize`. It's primary purpose is to define the column name. In cases where the `to_table` of the foreign key is different than the column name we should be able to specify it individually.
* | Merge pull request #21938 from ↵Yves Senn2015-10-135-92/+107
|\ \ | | | | | | | | | | | | kamipo/move_schema_dumping_methods_into_appropriate_files Move the methods for schema dumping into `{mysql,postgresql}/schema_dumper.rb`
| * | Move the methods for schema dumping into `{mysql,postgresql}/schema_dumper.rb`Ryuta Kamizono2015-10-135-92/+107
| | | | | | | | | | | | | | | Current master branch includes many schema dumping improvements. It extract these features to the appropriate files.
* | | Merge pull request #21288 from yahonda/mysql_requires_passwordArthur Nogueira Neves2015-10-122-5/+5
|\ \ \ | | | | | | | | Allow mysql and mysql2 tests run by database user with password
| * | | Allow mysql and mysql2 tests run by database user with passwordYasuo Honda2015-08-182-5/+5
| | | |
* | | | Merge pull request #17388 from akampjes/masterArthur Nogueira Neves2015-10-124-0/+23
|\ \ \ \ | |_|/ / |/| | | ActionMailer https on URL with force_ssl = true
| * | | ActionMailer https on URL with force_ssl = trueAndrew Kampjes2015-08-144-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `config.force_ssl = true` will set config.action_mailer.default_url_options = { protocol: 'https' } If you have turned on force_ssl, and then gone to the effort of setting config.action_mailer.default_url_options = {host: 'example.com'} then you are probably pointing people back to your current app and want https on that too.
* | | | Merge pull request #21931 from paul/bugfix/remove-deprecated-pg_dump-flagYves Senn2015-10-123-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | Remove deprecated pg_dump -i flag
| * | | | Remove deprecated pg_dump -i flagPaul Sadauskas2015-10-101-1/+1
| | | | |
* | | | | Merge pull request #21933 from ↵Yves Senn2015-10-123-115/+129
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/move_schema_definiton_classes_into_appropriate_file Move schema definiton classes into the appropriate files
| * | | | | Move schema creation class into `mysql/schema_creation.rb`Ryuta Kamizono2015-10-112-53/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current master branch includes many schema creation improvements in MySQL. It extract these features to the appropriate file.
| * | | | | Move schema definition classes into `mysql/schema_definitions.rb`Ryuta Kamizono2015-10-112-62/+70
| |/ / / / | | | | | | | | | | | | | | | | | | | | Current master branch includes many schema definition improvements in MySQL. It extract these features to the appropriate file.
* | | | | Merge pull request #21849 from yui-knk/refactor_regexp_to_stringAndrew White2015-10-124-7/+14
|\ \ \ \ \ | | | | | | | | | | | | Change `Journey::Route#verb` to return string instead of regexp.
| * | | | | Change `Journey::Route#verb` to return string instead of regexp.yui-knk2015-10-034-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By [this commit](https://github.com/rails/rails/commit/0b476de445faf330c58255e2ec3eea0f3a7c1bfc) `Journey::Route#verb` need not to return verb as regexp. The returned value is used by inspector, so change it to be a string. Add inspect_with_multiple_verbs test case to keep the behavior of inspector correctly.
* | | | | | edit pass over the project Gemfile [ci skip]Xavier Noria2015-10-121-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revises the name of Rails components (they have a space). * Uniform word wrap at column 80.. * Uniform punctuation, according to our guidelines. * Minor edits of details seen in passing.
* | | | | | Merge pull request #21936 from y-yagi/do_not_generate_manifest_in_pluginsJeremy Daer2015-10-112-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | do not generate manifest.js in plugins
| * | | | | | do not generate manifest.js in pluginsyuuji.yaginuma2015-10-122-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Since the plugin generator do not generate assets, I think manifest.js also that it unnecessary.
* | | | | | Merge pull request #21934 from etdev/docs/deep-dup-typoClaudio B.2015-10-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] Fix typo in deep_dup docs
| * | | | | [ci skip] Fix typo in deep_dup docsEric Turner2015-10-121-1/+1
|/ / / / /
* | | | | Merge pull request #11410 from bogdan/increment-concurencyJeremy Daer2015-10-105-40/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Make AR#increment! and #decrement! concurrency-safe
| * | | | | Make #increment! and #decrement! methods concurency safeBogdan Gusiev2015-10-055-40/+41
| | | | | |
* | | | | | Merge pull request #20940 from rafaelsales/allow-multiple-root-routesRafael Mendonça França2015-10-102-2/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow multiple `root` routes in same scope level
| * | | | | | Allow multiple `root` routes in same scope levelRafael Sales2015-10-102-2/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application has multiple root entries with different constraints, the current solution is to use `get '/'`. Example: **Currently I have to do:** ```ruby get '/', to: 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } get '/', to: 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` **But I would like to do:** ```ruby root 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } root 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` Other URL matchers such as `get`, `post`, etc, already allows this, so I think it's fair that `root` also allow it since it's just a shortcut for a `get` internally.
* | | | | | Merge pull request #21631 from RobinClowers/fix-cache-instrumentationJeremy Daer2015-10-093-13/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix cache fetch instrumentation
| * | | | | | Fix Cache#fetch instrumentationRobin Clowers2015-09-141-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, you couldn't tell if a read was a hit or not when you called fetch.
| * | | | | | Add test cases for Cache#fetch instrumentationRobin Clowers2015-09-141-0/+28
| | | | | | |
* | | | | | | Merge pull request #21927 from ronakjangir47/remove_is_a_specRafael Mendonça França2015-10-092-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | used predicate methods to avoid is_a? checks
| * | | | | | | used predicate methods to avoid is_a? checksRonak Jangir2015-10-102-3/+5
| | | | | | | |
* | | | | | | | Merge pull request #21928 from Gaurav2728/update_ruby_oracle_gemRafael Mendonça França2015-10-091-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | update to ruby-oci8 - 2.2.0
| * | | | | | | update to ruby-oci8 - 2.2.0Gaurav Sharma2015-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It stopped `ruby 1.8` support, we already switched to `ruby >= 2.2.2`
* | | | | | | | Merge pull request #21878 from Gaurav2728/require_monitorMatthew Draper2015-10-101-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | monitor is require for SneakersAdapter
| * | | | | | | monitor is require for SneakersAdapterGaurav Sharma2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | we are using `@monitor = Monitor.new` that inherit from Monitor class, we leave behind this commit https://github.com/rails/rails/commit/cbfc8b36
* | | | | | | | Merge pull request #21912 from y-yagi/move_prepare_destination_to_publicSean Griffin2015-10-081-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | change `prepare_destination` to public API [ci skip]
| * | | | | | | | change `prepare_destination` to public API [ci skip]yuuji.yaginuma2015-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `prepare_destination` has been used in the template file for the generator, I think it should be a public API ref: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/test_unit/generator/templates/generator_test.rb#L8
* | | | | | | | | Avoid leaking the first relation we call #first onMatthew Draper2015-10-092-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the previous implementation, the block passed to define_singleton_method, which will live forever as the method body, captures the parameters (args and block) in its enclosure. For the current_scope registry, that can include an AR::Relation.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 10:17:11 +0000