aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
| * | | | | Update explanation to match exampleSteven Nunez2013-12-301-1/+1
|/ / / / /
* | | | | tidy AR CHANGELOG. [ci skip]Yves Senn2013-12-301-4/+7
| | | | |
* | | | | Merge pull request #13538 from robin850/patch-14Yves Senn2013-12-301-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Add a missing changelog entry for #13534 [ci skip]
| * | | | | Add a missing changelog entry for #13534 [ci skip]Robin Dupret2013-12-301-0/+12
| | | | | |
* | | | | | Remove deprecation warning for FIXTURES_PATHPiotr Sarnacki2013-12-301-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIXTURES_PATH has a bit different case than DatabaseTasks.fixtures_path, which was added along with deprecation. A use case for FIXTURES_PATH could be loading fixtures from a different directory just for a given test run. The implementation is fairly simple, so leaving it as it is won't hurt.
* | | | | | Revert "Install bundle gems to the system not to vendor/bundle"Piotr Sarnacki2013-12-301-1/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 875dd3edfd34eaa20120b6589b0d1905230e948f. The issue was fixed in rbx-2.2.3
* | | | | Merge pull request #13535 from schneems/schneems/extract-url-logicRafael Mendonça França2013-12-291-34/+79
|\ \ \ \ \ | | | | | | | | | | | | Extract db url connection logic to class
| * | | | | Extract db url connection logic to classschneems2013-12-291-34/+79
| |/ / / /
* | | | | Merge pull request #13527 from kuldeepaggarwal/f-independent-specsJosé Valim2013-12-293-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Use user-defined configurations in mysql tests
| * | | | | used user-defined configurations for running tests that might depend on ↵Kuldeep Aggarwal2013-12-293-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | user's system configuration
* | | | | | Merge pull request #13534 from kuldeepaggarwal/f-where-notJosé Valim2013-12-292-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | raise ArgumentError for nil in .where.not
| * | | | | | raise `ArgumentError` exception if `Model.where.not` is called with `nil` ↵Kuldeep Aggarwal2013-12-302-0/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | argument
* | | | | | Fix Encoding::CompatibilityError when public path is UTF-8Andrew White2013-12-298-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #5337 we forced the path encoding to ASCII-8BIT to prevent static file handling from blowing up before an application has had chance to deal with possibly invalid urls. However this has a negative side effect of making it an incompatible encoding if the application's public path has UTF-8 characters in it. To work around the problem we check to see if the path has a valid encoding once it has been unescaped. If it is not valid then we can return early since it will not match any file anyway. Fixes #13518
* | | | | | Fix method redefined warning message in mapper.rbAndrew White2013-12-291-2/+3
|/ / / / /
* | | | | Install bundle gems to the system not to vendor/bundlePiotr Sarnacki2013-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubinius has problems with bundling when shared gems are disabled (ie. when --path or --deployhment is used). There is no real reason to install it with --path on TravisCI, so I'm dropping it.
* | | | | blank? and present? commit to return singletons [Xavier Noria & Pavel Pravosud]Xavier Noria2013-12-283-25/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contract of blank? and present? was in principle to return Object, as we generally do, the test suite and description was consistent with that, but some examples had comments like "# => true". This cannot be unclear, we either fix the examples, or update the contract. Since users may be already assuming singletons due to the examples and the fact that they were returned before 30ba7ee, the safest option seems to be to revise the contract and the implementation of String#blank? The motivation for 30ba7ee was to improve the performance of the predicate, the refactor based on === is on par regarding speed. With this commit we start documenting return types using YARD conventions. We plan to document return types gradually.
* | | | | Merge pull request #13517 from jetthoughts/13516_blank_to_return_true_falseXavier Noria2013-12-281-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | String#blank? returns True/False
| * | | | Extracted blank matcher regexp to constantPaul Nikitochkin2013-12-281-1/+3
|/ / / /
* | | | Merge pull request #13514 from kuldeepaggarwal/f-removed-warningsYves Senn2013-12-281-1/+1
|\ \ \ \ | | | | | | | | | | Removed warnings: setting `changed_attributes` instance variable if it is already initialized.
| * | | | setting `changed_attributes` instance variable if it is already initialized.Kuldeep Aggarwal2013-12-281-1/+1
|/ / / /
* | | | Merge pull request #13513 from ilja/masterArun Agrawal2013-12-281-3/+4
|\ \ \ \ | | | | | | | | | | Typo fix [ci skip]
| * | | | Typo fix [ci skip]Ilja Krijger2013-12-281-3/+4
|/ / / /
* | | | Merge branch 'master' of github.com:rails/railsGuillermo Iguaran2013-12-272-0/+15
|\ \ \ \
| * \ \ \ Merge pull request #13474 from jdelStrother/becomesYves Senn2013-12-272-0/+15
| |\ \ \ \ | | | | | | | | | | | | Copy changed_attributes across to newly become'd records
| | * | | | Copy changed_attributes across to newly become'd recordsJonathan del Strother2013-12-272-0/+15
| | | | | | | | | | | | | | | | | | Without this, the original record's values won't get saved, since the partial insertions support (https://github.com/rails/rails/commit/144e8691cbfb8bba77f18cfe68d5e7fd48887f5e) checks for changed values and thinks there are none.
* | | | | | Update to Unicode 6.3.0Norman Clarke2013-12-272-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 6.3.0 was released on September 30, 2013. http://unicode-inc.blogspot.com.ar/2013/09/announcing-unicode-standard-version-63.html
* | | | | Merge pull request #13505 from robin850/patch-13Yves Senn2013-12-272-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Ensure backward compatibility between Minitest 5 and 4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 15:09:17 +0000