aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #24090 from ↵Rafael França2016-03-061-6/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | meinac/silence_deprecation_warning_action_view_tests Silence deprecation message on action_view test cases
| * | | | | | Silence deprecation message for dynamic controller and actions on ↵Mehmet Emin İNAÇ2016-03-071-6/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | action_view test cases
* | | | | | Merge pull request #24085 from vipulnsward/i18n-test-additionKasper Timm Hansen2016-03-061-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | i18n fallbacks test fixes
| * | | | | | - Added i18n test to verify assigning hash directly to fallbacks instead of ↵Vipul A M2016-03-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using map - Fixed test name for setting fallbacks to config.i18n.fallbacks = [{ :ca => :'es-ES' }]
* | | | | | | prefer require_relative over require + File.expand_pathXavier Noria2016-03-064-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reads much better doesn't it.
* | | | | | | use __dir__ for relative paths in config/application.rbXavier Noria2016-03-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | use __dir__ for relative paths in config/boot.rbXavier Noria2016-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | use __dir__ to load the application in environment.rbXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | use __dir__ to load the environment in config.ruXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-03-069-32/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/association_basics.md
| * | | | | | | [ci skip] Update all guides with `null: false` change in migrationsPrathamesh Sonpatki2016-03-033-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We no longer add `null: false` for timestamps columns as per rails/rails@a939506. - Followup of https://github.com/rails/docrails/commit/14867b1a9af813b0147bba2ae06675137d61d77b.
| * | | | | | | [ci skip] Update getting started guide for chanages in migrations APIPrathamesh Sonpatki2016-03-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We no longer add `null: false` for timestamps columns as per https://github.com/rails/rails/commit/a939506f297b667291480f26fa32a373a18ae06a. - Similarly `references` and `belongs_to` columns no longer mention `index: true` in migration files. It's added by default as per https://github.com/rails/rails/commit/909818b93b8f1bd4d7053a1c5d8135b9b0cbe865.
| * | | | | | | [ci skip] fix json outputMikhail Dieterle2016-02-271-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Remove reference to Rails 4 in the initialization guide.Prathamesh Sonpatki2016-02-262-3/+3
| | | | | | | |
| * | | | | | | [ci skip] Fix `'id'` to be fixed-width fontyui-knk2016-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As shown below, we should use <tt>...</tt> for string literal ``` $ echo "+'id'+" | rdoc --pipe <p>+&#39;id&#39;+</p> $ echo "<tt>'id'</tt>" | rdoc --pipe <p><code>&#39;id&#39;</code></p> ```
| * | | | | | | [ci skip] fix typosMikhail Dieterle2016-02-141-3/+3
| | | | | | | |
| * | | | | | | [ci skip] Update 'Testing Active Record'yui-knk2016-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up 8c629bf463b47643712570d4511a68b9a3da1476. `bundle exec rake test` in 'activerecord' runs tests for * sqlite3 * mysql2 * postgresql
* | | | | | | | This code won't workAkira Matsuda2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #24082 from kamipo/fix_typo_sslcipherRafael França2016-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo `--ssl-cipher`
| * | | | | | | | Fix typo `--ssl-cipher`Ryuta Kamizono2016-03-061-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #22543.
* | | | | | | | Merge pull request #24081 from y-yagi/remove_entry_for_reverted_commitRafael França2016-03-051-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove entry for reverted commit [ci skip]
| * | | | | | | | remove entry for reverted commit [ci skip]yuuji.yaginuma2016-03-061-3/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Follow up to ddf4c953ae8d10489e0bfd6008bd76395f6e1267
* | | | | | | | Merge pull request #24079 from y-yagi/chage_date_time_to_datetimeSean Griffin2016-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | chage `date_time` type ` to `datetime`
| * | | | | | | | chage `date_time` type ` to `datetime`yuuji.yaginuma2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are using `datetime` in migration, better to use `datetime` is I think that confusion is less.
* | | | | | | | | Merge pull request #24080 from y-yagi/make_attributes_api_example_to_workRafael França2016-03-051-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | make attributes API example to work [ci skip]
| * | | | | | | | | make attributes API example to work [ci skip]yuuji.yaginuma2016-03-061-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a need to pass the keyword arguments to `attribute` method.
* / / / / / / / / Update the rendering guide to match the current behaviorRafael Mendonça França2016-03-051-10/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the latest security releases render with a trailing slash no more call render :file. Also add a note about the security implications of using it with user parameters.
* | | | | | | | Revert "Merge pull request #22764 from ↵Rafael Mendonça França2016-03-053-44/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stevenspiel/titleize_model_name_for_default_submit_button_value" This reverts commit 4158974c60d817c9bc1e2aecb342161295f2ac0d, reversing changes made to 3d590add45b7ff1de972d99b076cb504d5208935. Reason: This break i18n in some languages. See https://github.com/rails/rails/issues/791#issuecomment-192724640
* | | | | | | | Merge pull request #24070 from ↵Rafael França2016-03-054-15/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_unnecessary_config_in_sprockets-rails-3 remove config that are no longer needed in sprockets-rails 3
| * | | | | | | | remove config that are no longer needed in sprockets-rails 3yuuji.yaginuma2016-03-054-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `config.assets.raise_runtime_errors` and `config.assets.digest` are enabled by default in sprockets-rails 3.
* | | | | | | | | Merge pull request #24072 from byroot/remove-http-cache-forever-versionRafael França2016-03-052-13/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove http_cache_forever's version parameter
| * | | | | | | | | Remove http_cache_forever's version parameterJean Boussier2016-03-052-13/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #24075 from y-yagi/fix_typoSean Griffin2016-03-051-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix typo in attribute example [ci skip]
| * | | | | | | | | fix typo in attribute example [ci skip]yuuji.yaginuma2016-03-051-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24074 from meinac/small_doc_fixAndrew White2016-03-051-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | A small documentation fix about autosave associations [ci skip]
| * | | | | | | | | A small documentation fix about autosave associations [ci skip]Mehmet Emin İNAÇ2016-03-051-1/+1
| |/ / / / / / / /
* / / / / / / / / define APP_PATH with __dir__Xavier Noria2016-03-051-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defining paths relative to a file name has always hurt my soul, with __dir__ we can restore order in the Universe.
* | | | | | | | Merge pull request #24069 from kamipo/fix_indentationArun Agrawal2016-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix indentation [ci skip]
| * | | | | | | | Fix indentation [ci skip]Ryuta Kamizono2016-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #24050.
* | | | | | | | | Merge pull request #24068 from y-yagi/remove_outdated_commentArun Agrawal2016-03-051-6/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | remove outdated comment [ci skip]
| * | | | | | | | remove outdated comment [ci skip]yuuji.yaginuma2016-03-051-6/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Currently use minitest mock, mocha is not used.
* | | | | | | | Merge pull request #24064 from rubys/guides_puma3_startRafael França2016-03-043-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Match Puma 3 startup messages [ci skip]
| * | | | | | | | Match Puma 3 startup messages [ci skip]Sam Ruby2016-03-043-8/+8
| | | | | | | | |
* | | | | | | | | start hiding the `scope_chain` data structureAaron Patterson2016-03-042-1/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a predicate method that doesn't need to build a scope chain, but also hides the data structure used for representing the scope chain.
* | | | | | | | Merge pull request #24061 from perceptec/update-engines-guideEileen M. Uchitelle2016-03-041-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix author callback in engines guide [ci skip]
| * | | | | | | | Fix author callback in engines guide [ci skip]Michael Ryan2016-03-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `before_save` callback used with `set_author` results in the validation error "Author must exist," due to the change in `belongs_to` behavior introduced by #18937. Use `before_validation` instead.
* | | | | | | | | We're not using $2 from this RegexpAkira Matsuda2016-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/24052/files#r55083975
* | | | | | | | | don't build the reflection chain to calculate `nested?`Aaron Patterson2016-03-041-1/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know a reflection can be considered as `nested?` if the source reflection or the through reflection are also through reflections (since the through reflection will also add another join table). This allows us to avoid traversing the entire reflection tree just to calculate whether or not there will be more join tables.
* | | | | | | | remove useless ivarAaron Patterson2016-03-041-1/+0
| | | | | | | |
* | | | | | | | Merge pull request #24053 from mohitnatoo/rails-dev-cacheKasper Timm Hansen2016-03-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | using rails dev:cache instead of rake dev:cache in test case
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:00:56 +0000