aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * - using rails dev:cache instead of rake dev:cache in test caseMohit Natoo2016-03-041-1/+1
| |
* | Merge pull request #24050 from mohitnatoo/rails-routes-railtiesKasper Timm Hansen2016-03-041-7/+7
|\ \ | | | | | | [ci skip] correcting test case specifying `rails routes` instead of `rake routes`
| * | making a test definition more clear.Mohit Natoo2016-03-041-1/+1
| | |
| * | [ci skip] using correcting test case names specifying `rails routes` instead ↵Mohit Natoo2016-03-041-6/+6
| |/ | | | | | | of `rake routes`
* | Merge pull request #24057 from javan/actioncable-return-subscriptionJeremy Daer2016-03-041-3/+4
|\ \ | | | | | | Action Cable: Return subscription object(s) when updating the collection
| * | Return subscription object(s) when updating the collectionJavan Makhmali2016-03-041-3/+4
|/ /
* | Merge pull request #24056 from lifo/cable-create-subscriptions-fixJeremy Daer2016-03-041-0/+2
|\ \ | | | | | | Fix ActionCable.Subscriptions#create
| * | Make sure ActionCable.Subscriptions#create always returns the newly created ↵Pratik Naik2016-03-041-0/+2
|/ / | | | | | | subscription object
* | Merge pull request #24052 from ↵Akira Matsuda2016-03-043-1/+7
|\ \ | | | | | | | | | | | | bquorning/partial-rendering-with-collection-and-dot-in-partial-name Fix partial rendering with dot in filename
| * | Fix partial rendering with dot in filenameBenjamin Quorning2016-03-043-1/+7
|/ / | | | | | | | | | | | | | | When rendering a collection with a partial whose filename contains a dot, e.g. "customer.mobile", we would set a `locals[:'customer.mobile']` variable instead of, as in earlier versions of Rails, `locals[:customer]`. This bug was introduced in da9038eaa5d19c77c734a044c6b35d7bfac01104.
* | Merge pull request #24049 from mohitnatoo/railties-run-manuallyप्रथमेश Sonpatki2016-03-041-2/+1
|\ \ | |/ |/| Correcting sentence in description of application.rb in ralities
| * [ci skip] correcting sentence in description of application.rbMohit Natoo2016-03-041-2/+1
|/ | | | Adding period in the end.
* Merge pull request #24045 from Sarah-Alsinan/patch-4Kasper Timm Hansen2016-03-041-1/+1
|\ | | | | Update base.rb [ci skip]
| * Update base.rbSarah A2016-03-031-1/+1
|/
* Merge pull request #24042 from Sarah-Alsinan/patch-3Arun Agrawal2016-03-041-1/+1
|\ | | | | Update Gemfile
| * Update GemfileSarah A2016-03-031-1/+1
|/ | | Changes "as has to be loaded" to "as it has to be loaded"
* Merge pull request #24039 from javan/actioncable-cleanupJeremy Daer2016-03-036-22/+24
|\ | | | | Action Cable: client side 💅
| * Store reference to Subscriptions instance for convenienceJavan Makhmali2016-03-031-5/+6
| |
| * Implicity add Subscription instance to subscriptions collectionJavan Makhmali2016-03-032-13/+12
| |
| * Share default mount path with client side .jsJavan Makhmali2016-03-033-3/+4
| |
| * Fix location of default mount path valueJavan Makhmali2016-03-031-2/+3
|/ | | | #getConfig was implmented as general utility for reading action-cable-* meta tags (hence the `name` argument). Introduced in 8b69f1eeba753c38364fb88136b2503480f2de1d.
* Merge pull request #24038 from javan/actioncable-lazy-connection-monitorJeremy Daer2016-03-033-41/+52
|\ | | | | Action Cable: Defer starting connection monitor until a connection is opened
| * Defer starting connection monitor until a connection is openedJavan Makhmali2016-03-033-41/+52
|/
* Merge pull request #24021 from y-yagi/add_scaffold_stylesheet_to_guideJon Moss2016-03-031-0/+1
|\ | | | | add `scaffold_stylesheet` method to guide [ci skip]
| * add `scaffold_stylesheet` method to guide [ci skip]yuuji.yaginuma2016-03-041-0/+1
| | | | | | | | `scaffold_stylesheet` was added in #20479.
* | Merge pull request #24036 from javan/actioncable-lazy-connectJeremy Daer2016-03-033-9/+10
|\ \ | | | | | | Action Cable: Establish WebSocket connection when first subscription is created
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 14:44:15 +0000