aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* provide correct information [ci skip]Kuldeep Aggarwal2014-01-021-2/+2
|
* Adding missing requireRafael Mendonça França2014-01-021-0/+1
|
* Enable fast_finish in the travis configurationRafael Mendonça França2014-01-021-0/+1
| | | | | | | Since rbx and jruby builds are being allowed to fail lets receive the build information early enabling this option See http://about.travis-ci.org/blog/2013-11-27-fast-finishing-builds/
* Merge pull request #13569 from schneems/schneems/default-url-sub-keyRafael Mendonça França2014-01-0111-12/+26
|\ | | | | Move default production database to URL sub key
| * Move default production database to URL sub keyschneems2014-01-0111-12/+26
| | | | | | | | By using the URL sub key in the `database.yml` by default we are exposing the ability to set other attributes such as `pool` or `reap_frequency` without need of modifying the URL to contain non-connection specific information.
* | Downgrade bundler until 1.5.2 is availableAndrew White2014-01-011-1/+1
|/ | | | | | | | | | | Bundler sets the THOR_DEBUG environment variable causing Thor to re-raise exceptions on exit. This is breaking the railties tests for generators where we are trying to capture error output. The PR bundler/bundler#2794 fixes this by adding a per-instance config `:debug` but this has not been released yet so to prevent errors going unnoticed downgrade bundler to 1.3.5 until such a time that 1.5.2 has been released.
* Merge pull request #13542 from robin850/issue-13530Rafael Mendonça França2014-01-013-3/+21
|\ | | | | | | Fix enum writers when using integers
| * Improve enum documentationRobin Dupret2014-01-011-1/+6
| | | | | | | | | | Add a mention about the automatic generation of scopes based on the allowed values of the field on the enum documentation.
| * Fix the enums writer methodsRobin Dupret2014-01-013-2/+15
| | | | | | | | | | | | | | | | | | | | | | Previously, the writer methods would simply check whether the passed argument was the symbol representing the integer value of an enum field. Therefore, it was not possible to specify the numeric value itself but the dynamically defined scopes generate where clauses relying on this kind of values so a chained call to a method like `find_or_initialize_by` would trigger an `ArgumentError`. Reference #13530
* | Add CHANGELOG entry for #13557 [ci skip]Rafael Mendonça França2014-01-012-1/+4
| |
* | Merge pull request #13557 from gmarik/patch-1Rafael Mendonça França2014-01-012-1/+18
|\ \ | | | | | | | | | Use `Array#wrap` instead `Array()`
| * | add test casegmarik2013-12-311-0/+17
| | |
| * | Use `Array#wrap` instead `Array()`gmarik2013-12-311-1/+1
| | | | | | | | | | | | - since `Array()` calls `to_ary` or `to_a` on a subject - the intent is to 'wrap' subject into an array
* | | Removed elipsis indicating that the reader should have more code than what ↵Mo Omer2014-01-011-2/+0
| | | | | | | | | | | | | | | | | | is pasted. [ci skip]
* | | Make explicit that the view file need to be created [ci skip]Rafael Mendonça França2014-01-011-1/+1
| | | | | | | | | | | | Closes #13566
* | | Do not highlight rake routes output as ruby code [ci skip]Rafael Mendonça França2014-01-011-2/+2
| | | | | | | | | | | | Closes #13565
* | | Don't lazy load the tzinfo libraryAndrew White2014-01-012-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy loading the tzinfo library doesn't really buy us anything because the gem is installed as a dependency via the gemspec and if a developer is using Active Support outside of Rails then they can cherry pick which files to load anyway. Fixes #13553
* | | Merge pull request #13563 from vipulnsward/2014-is-hereLauro Caetano2014-01-0114-14/+14
|\ \ \ | | | | | | | | 2014 is here.
| * | | update copyright notices to 2014. [ci skip]Vipul A M2014-01-0114-14/+14
|/ / /
* | | Improve the tests to not call assert_nothing_raisedRafael Mendonça França2014-01-011-4/+1
| | |
* | | Merge pull request #13550 from vipulnsward/13437-fixRafael Mendonça França2014-01-013-1/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix for #13437 Conflicts: activerecord/CHANGELOG.md
| * | | https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5 ↵Vipul A M2013-12-313-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8 introduced a regression in includes/preloades by calling `read_attribute` on an association when preloading takes places, instead of using loaded records in `association.target`. tl;dr Records are not made properly available via `read_attribute` when preloding in simultaneous, but value of `@loaded` is already set true, and records concatenated in `association.target` on an association object. When `@loaded` is true we return an object of `AlreadyLoaded` in preload_for. In `AlreadyLoaded` to return preloaded records we make wrong use of `read_attribute`, instead of `target` records. The regression is fixed by making use of the loaded records in `association.target` when the preloading takes place. Fixes #13437
* | | | Merge pull request #13556 from yahonda/update_mysql_grantRafael Mendonça França2014-01-013-2/+4
|\ \ \ \ | | | | | | | | | | Update grant statement to address #13549
| * | | | Change the inexistent database name to inexistent_activerecord_unittestYasuo Honda2014-01-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make this grant statement described in the document works GRANT ALL PRIVILEGES ON inexistent_activerecord_unittest.* to 'rails'@'localhost';
| * | | | Update grant statement to address #13549Yasuo Honda2014-01-011-0/+2
| | | | |
* | | | | Merge pull request #13561 from robin850/issue-11723Rafael Mendonça França2014-01-012-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Avoid raising a NameError on FreeBSD using Date
| * | | | | Avoid raising a NameError on FreeBSD using DateRobin Dupret2014-01-012-2/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Date object has a xmlschema method starting with Ruby 1.9 so we were assuming that we could safely remove this method and redefine it later but the call to remove_method throws a NameError on FreeBSD so we should rely on remove_possible_method instead. This call is actually needed to avoid warnings when running the test suite. Fixes #11723
* | | | | Merge pull request #13559 from JuanitoFatas/action-controllerRobin Dupret2014-01-011-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Add missing flash message in block filter example.
| * | | | [ci skip] Add missing flash message in block filter example.Juanito Fatas2014-01-011-2/+5
| | | | | | | | | | | | | | | | | | | | Also make all three examples consistent.
* | | | | Merge pull request #13558 from bcardarella/bc-fix-example-syntaxArun Agrawal2014-01-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix comment syntax
| * | | | Fix comment syntaxBrian Cardarella2013-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | The code syntax in the comment example is invalid
* | | | | Allow engine root relative redirects using an empty string.Andrew White2014-01-013-49/+149
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: # application routes.rb mount BlogEngine => '/blog' # engine routes.rb get '/welcome' => redirect('') This now redirects to the path `/blog`, whereas before it would redirect to the application root path. In the case of a path redirect or a custom redirect if the path returned contains a host then the path is treated as absolute. Similarly for option redirects, if the options hash returned contains a `:host` or `:domain` key then the path is treated as absolute. Fixes #7977
* | | | Merge pull request #13419 from amrnt/nullize-enumGodfrey Chan2013-12-313-1/+43
|\ \ \ \ | | | | | | | | | | Add the ability to nullize the enum column
| * | | | Add the ability to nullify the `enum` columnAmr Tamimi2014-01-013-1/+43
|/ / / /
* | | | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2013-12-3110-42/+232
|\| | |
| * | | Merge pull request #13470 from strzalek/variants-all-anyDavid Heinemeier Hansson2013-12-315-27/+217
| |\ \ \ | | |_|/ | |/| | Add any/all support for variants
| | * | Add any/all support for variantsŁukasz Strzałkowski2013-12-265-27/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like `format.any`, you can do the same with variants. It works for both inline: respond_to do |format| format.html.any { render text: "any" } format.html.phone { render text: "phone" } end and block syntax: respond_to do |format| format.html do |variant| variant.any(:tablet, :phablet){ render text: "any" } variant.phone { render text: "phone" } end end
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-315-15/+15
| |\ \ \
| | * | | Fix few typos and improve markup at some levelsRobin Dupret2013-12-244-5/+5
| | | | |
| | * | | [ci skip] trailing documentation whitespaceschneems2013-12-191-10/+10
| | | | |
* | | | | Improve tests to use only public APIRafael Mendonça França2013-12-311-3/+2
| | | | |
* | | | | Merge pull request #13525 from huoxito/make-outer-joins-on-proper-parentRafael Mendonça França2013-12-312-2/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Make outer joins on proper parent
| * | | | Make outer joins on proper parentWashington Luiz2013-12-312-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Outer joins were being built on the root relation klass rather than the one specified in the join dependency root
* | | | | Merge pull request #13131 from gja/changed-accepts-valuesGodfrey Chan2013-12-303-2/+22
|\ \ \ \ \ | |/ / / / |/| | | | Allows you to check if a field has changed to a particular value
| * | | | Allows you to check if an attribute has changed to a particular valueTejas Dinkar2013-12-153-2/+22
| | | | | | | | | | | | | | | | | | | | model.name_changed?(from: "Pete", to: "Ringo")
* | | | | Merge pull request #13541 from schneems/schneems/db-url-sub-keyRafael Mendonça França2013-12-303-0/+32
|\ \ \ \ \ | | | | | | | | | | | | Allow "url" sub key in database.yml configuration
| * | | | | Allow "url" sub key in database.yml configurationschneems2013-12-303-0/+32
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a developer can pass in a YAML configuration that fully specifies connection information: ``` production: database: triage_production adapter: password pool: 5 ``` They can also pass in a string that specifies a connection URL directly to an environment key: ``` production: postgresql://localhost/foo ``` This PR allows the use of both a connection url and specifying connection attributes via YAML through the use of the "url" sub key: ``` production: url: postgresql://localhost/foo pool: 3 ``` This will allow developers to inherit Active Record options such as `pool` from `&defaults` and still use a secure connection url such as `<%= ENV['DATABASE_URL'] %>`. The URL is expanded into a hash and then merged back into the YAML hash. If there are any conflicts, the values from the connection URL are preferred. Talked this over with @josevalim
* | | | | Merge pull request #13536 from schneems/schneems/connection-spec-docsRichard Schneeman2013-12-301-14/+80
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] ConnectionSpecification::Resolver Docs
| * | | | | [ci skip] ConnectionSpecification::Resolver Docsschneems2013-12-301-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the internal interfaces of `ConnectionSpecification::Resolver` Change method name from `config` to `env` to better match the most common use case.
* | | | | | Merge pull request #13539 from StevenNunez/patch-1Xavier Noria2013-12-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update explanation to match example [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:21:50 +0000