aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19823 from sbhatore/doc_fix_1Rafael Mendonça França2015-04-231-0/+8
|\ | | | | [ci skip] Description inside Signed and Encrypted CookieJars added
| * Squashed commit of the following:Siddharth Bhatore2015-04-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit a88875ac6abaa4d8116b42af8cd71189ce3d44d3 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Thu Apr 23 12:26:08 2015 +0530 [ci skip] Update doc fix cookies commit f175eaa7a21db898fc6c66334f770831028f9d00 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Mon Apr 20 12:58:04 2015 +0530 Description inside Signed and Encrypted CookieJars added
* | Merge pull request #18880 from mudge/timestamp-index-bugRafael Mendonça França2015-04-233-0/+20
|\ \ | | | | | | | | | Fix missing index when using timestamps with index
| * | Fix missing index when using timestamps with indexPaul Mucur2015-04-153-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `index` option used with `timestamps` should be passed to both `column` definitions for `created_at` and `updated_at` rather than just the first. This was happening because `Hash#delete` is used to extract the `index` option passed to `timestamps`, thereby mutating the `options` hash in-place. Now take a copy of the `options` before deleting so that the original is not modified.
* | | Merge pull request #19875 from cllns/fix-css-formatting-in-welcome-indexRafael Mendonça França2015-04-231-3/+10
|\ \ \ | | | | | | | | Fix CSS formatting in welcome#index.html.erb
| * | | Fix CSS formatting in welcome#index.html.erbSean Collins2015-04-231-3/+10
|/ / /
* | | Merge pull request #19872 from Ecco/masterYves Senn2015-04-231-1/+1
|\ \ \ | | | | | | | | Fix a minor grammatical issue in the doc [ci skip]
| * | | Fix a minor grammatical issue in the docRomain Goyet2015-04-231-1/+1
| | | |
* | | | Merge pull request #19870 from thenickcox/action_dispatch_mw_docsRichard Schneeman2015-04-231-6/+13
|\ \ \ \ | |/ / / |/| | | [ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware
| * | | [ci skip] Add, clean up docs in ActionDispatch ActionDispatch middlewareNick Cox2015-04-221-6/+13
|/ / /
* | | Queue Classic runs a second earlier than scheduledMatthew Draper2015-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | That seems to be a bug, but as we don't actually care about the precision for our test, we'll just give it a bit longer. [Matthew Draper & Cristian Bica]
* | | Require yaml before trying to rescue its exception classRafael Mendonça França2015-04-221-1/+1
| | |
* | | Remove sqlite support from `rails dbconsole`Andrew White2015-04-223-9/+4
| | | | | | | | | | | | | | | | | | Support for versions of SQLite less than 3 was removed in #6011 as part of the Rails 4.0 release. Therefore there is no need to have support for it in the `rails dbconsole` command anymore.
* | | Merge pull request #19862 from piton4eg/patch-2Rafael Mendonça França2015-04-221-2/+2
|\ \ \ | | | | | | | | Fix find_each options [ci skip]
| * | | Fix find_each options [ci skip]Alexey Markov2015-04-221-2/+2
|/ / /
* | | Don't ask something that we don't want toRafael Mendonça França2015-04-221-1/+1
| | | | | | | | | | | | | | | | | | We only want to support adapters that we officially support through the entire framework so it is better to not ask patches for adapters that we may not support
* | | Merge pull request #17333 from rails/encode-twz-tzinfo-in-yamlAndrew White2015-04-225-8/+76
|\ \ \ | | | | | | | | Improve ActiveSupport::TimeWithZone conversion to YAML
| * | | Improve ActiveSupport::TimeWithZone conversion to YAMLAndrew White2015-04-225-8/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when converting AS::TimeWithZone to YAML it would be output as a UTC timestamp. Whilst this preserves the time information accurately it loses the timezone information. This commit changes that so that it is saved along with the time information. It also provides nicer encoding of AS::TimeZone instances themselves which previously embedded all of the data from the TZInfo records. Fixes #9183.
* | | | Merge pull request #19858 from cllns/fix-scaffolding-css-formattingRafael Mendonça França2015-04-221-7/+20
|\ \ \ \ | | | | | | | | | | Fix formatting of scaffold css
| * | | | Fix formatting of scaffold cssSean Collins2015-04-221-7/+20
| | | | |
* | | | | Merge pull request #19857 from sikachu/remove-alias-method-chain-docRafael Mendonça França2015-04-221-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Clearify that alias_method_chain is deprecated
| * | | | Clearify that alias_method_chain is deprecatedPrem Sichanugrist2015-04-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This was not clear on the API documentation that the method was deprecated in a982a42d766169c2170d7f100c2a5ceb5430efb1.
* | | | | Refactor ActiveSupport::Timezone#strptimeAndrew White2015-04-222-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | Make strptime behave more like parse when components are missing and share behavior between the two methods.
* | | | | Add ActiveSupport::TimeZone#strptime.Paul A Jungwirth2015-04-223-0/+90
| | | | | | | | | | | | | | | | | | | | This makes it easier to parse user-inputted times as from a given time zone.
* | | | | Merge pull request #19856 from sikachu/silence-mathn-warningRafael Mendonça França2015-04-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Silence warning from requiring mathn
| * | | | | Silence warning from requiring mathnPrem Sichanugrist2015-04-221-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running Action View test case currently printing out this warning: lib/mathn.rb is deprecated This should silence the warning since we really want to require this file in this test.
* | | | | Merge pull request #19852 from sbhatore/doc_fix_cookiesSantiago Pastorino2015-04-221-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] UpgradeLegacySignedCookieJar Doc fix
| * | | | [ci skip] UpgradeLegacySignedCookieJar Doc fixSiddharth Bhatore2015-04-221-2/+2
| | | | |
* | | | | pass over CHANGELOGs. [ci skip]Yves Senn2015-04-226-20/+24
|/ / / /
* | | | Merge pull request #19819 from gazay/no_fork_issueRafael Mendonça França2015-04-221-4/+4
|\ \ \ \ | | | | | | | | | | MRI compatible code for ActiveSupport::Testing::Isolation::Subprocess
| * | | | MRI compatible code for ActiveSupport::Testing::Isolation::SubprocessAlexey Gaziev2015-04-191-4/+4
| | | | |
* | | | | Merge pull request #19833 from cllns/fix-scaffolding-spacingRafael Mendonça França2015-04-221-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add newlines between divs in form scaffolding
| * | | | | Add blank lines between divs in form scaffoldingSean Collins2015-04-201-0/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #19779 from ↵Zachary Scott2015-04-211-13/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jonatack/improve-contributing-to-ruby-on-rails-guide Improve the Contributing to Rails Guide [skip ci]
| * | | | | Improve the Contributing to Rails Guide [skip ci]Jon Atack2015-04-161-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First commit: This PR improves the "4.12 Commit Your Changes" section of the Contributing to Ruby on Rails Guide: - Fix formatting of the commit message example - Improve readability and clarity - Fix grammar - Wrap lines See the before and after images below in this PR. ----- Second commit: - Rewrite to remove the word "buffer" [skip ci]
* | | | | | Merge pull request #19847 from ↵Rafael Mendonça França2015-04-213-2/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fertapric/activemodel-dirty-after-save-syntactic-sugar Activemode::Dirty attributes query methods consistency before and after saving.
| * | | | | | Add `ActiveModel::Dirty#[attr_name]_previously_changed?` andFernando Tapia Rico2015-04-213-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveModel::Dirty#[attr_name]_previous_change` to improve access to recorded changes after the model has been saved. It makes the dirty-attributes query methods consistent before and after saving.
* | | | | | | Merge pull request #19846 from y-yagi/update_ruby_versionRafael Mendonça França2015-04-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | update Ruby required version in Getting Started guide [ci skip]
| * | | | | | | update Ruby required version in Getting Started guide [ci skip]yuuji.yaginuma2015-04-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #19842 from yui-knk/fix/ruby_versionZachary Scott2015-04-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Update `current version of Ruby`
| * | | | | | | [ci skip] Update `current version of Ruby`yui-knk2015-04-211-1/+1
| |/ / / / / /
* / / / / / / Rename association option :class to :anonymous_classAndrew White2015-04-219-25/+31
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 1f006c an option was added called :class to allow passing anonymous classes to association definitions. Since using :class instead of :class_name is a fairly common typo even amongst experienced developers this can result in hard to debug errors arising in raise_on_type_mismatch? To fix this we're renaming the option from :class to :anonymous_class as that is a more correct description of what the option is for. Since this was an internal, undocumented option there is no need for a deprecation. Fixes #19659
* | | | | | Merge pull request #19839 from yui-knk/fix/guide2Yves Senn2015-04-211-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ci skip] Fix linked html file
| * | | | | [ci skip] Fix linked html fileyui-knk2015-04-211-1/+1
|/ / / / /
* | | | | capitalize titleXavier Noria2015-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the guidelines: http://guides.rubyonrails.org/ruby_on_rails_guides_guidelines.html#headings References #19821.
* | | | | Merge pull request #19822 from y-yagi/correct_generic_template_linkGodfrey Chan2015-04-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | correct link to Generic template [ci skip]
| * | | | | correct link to Generic template [ci skip]yuuji.yaginuma2015-04-201-1/+1
|/ / / / /
* | | | | Implicitly skip spring for `rails new --dev`Godfrey Chan2015-04-202-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spring seems like an obvious foot gun for the `--dev` setup, presumably you are about to make lots of changes to the codebase, so it should always reload the framework.
* | | | | Consistency: Rails master -> edge Rails [ci skip]Godfrey Chan2015-04-201-1/+1
| | | | |
* | | | | Fix typos in contributing guide [ci skip]Godfrey Chan2015-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | * includes -> include * "on your computer" is implied
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 18:15:54 +0000