aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch '3-2-sec' into 3-2-stableRafael Mendonça França2014-07-0218-12/+58
|\|
| * Preparing for 3.2.19 releaseRafael Mendonça França2014-07-0216-9/+50
| * Check against bit string values using multiline regexpRafael Mendonça França2014-07-022-3/+8
* | Use a version of execjs compatible with Ruby 1.8Rafael Mendonça França2014-06-261-0/+3
|/
* Make sure Active Support configurations are applied correctlyRafael Mendonça França2014-06-262-0/+19
* Revert "Merge pull request #15794 from vishalzambre/patch-1"Guillermo Iguaran2014-06-181-1/+1
* Merge pull request #15794 from vishalzambre/patch-1Guillermo Iguaran2014-06-181-1/+1
|\
| * File.exists? is a deprecated name, use File.exist?Vishal Zambre2014-06-181-1/+1
|/
* Feature detect based on Ruby version.Aaron Patterson2014-05-181-1/+1
* feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053Aaron Patterson2014-05-101-5/+21
* use fnmatch to test for case insensitive file systemsAaron Patterson2014-05-091-4/+2
* Merge branch '3-2-sec' into 3-2-stableRafael Mendonça França2014-05-0619-14/+155
|\
| * Fix broken tests of the previous releaseRafael Mendonça França2014-05-062-6/+6
| * Preparing for 3.2.18 releaseRafael Mendonça França2014-05-0616-9/+115
| * Only accept actions without File::SEPARATOR in the name.Rafael Mendonça França2014-05-052-4/+41
* | Merge branch '3-2-17' into 3-2-stableRafael Mendonça França2014-02-1814-12/+103
|\|
| * Preparing for 3.2.17 releaseRafael Mendonça França2014-02-1810-9/+19
| * Use the reference for the mime type to get the formatRafael Mendonça França2014-02-182-1/+18
| * Escape format, negative_format and units options of number helpersRafael Mendonça França2014-02-182-1/+64
* | Merge pull request #13613 from simi/patch-1Damien Mathieu2014-01-061-1/+1
|\ \
| * | Fix force_ssl.rb documentation. Close tt tag.Josef Šimánek2014-01-061-1/+1
|/ /
* | Merge pull request #13315 from tyre/patch-1Rafael Mendonça França2013-12-131-1/+1
|\ \
| * | Update Session Store DocumentationChris Maddox2013-12-131-1/+1
|/ /
* | Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_optionCarlos Antonio da Silva2013-12-043-1/+24
* | Fix documentation of number_to_currency helperRafael Mendonça França2013-12-042-5/+5
* | Merge pull request #13162 from makandra/3-2-stableRafael Mendonça França2013-12-041-4/+4
|\ \ | |/ |/|
| * repair a test broken by the number_to_currency XSS fixTobias Kraze2013-12-041-4/+4
|/
* updating the changelogAaron Patterson2013-12-0210-9/+17
* Deep Munge the parameters for GET and POSTMichael Koziarski2013-12-022-2/+17
* Stop using i18n's built in HTML error handling.Michael Koziarski2013-12-022-14/+9
* Escape the unit value provided to number_to_currencyMichael Koziarski2013-12-022-4/+5
* Only use valid mime type symbols as cache keysAaron Patterson2013-11-301-0/+7
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-10-1619-21/+40
|\
| * updating changelogsAaron Patterson2013-10-167-3/+19
| * bumping to 3.2.15Aaron Patterson2013-10-159-9/+9
| * Merge branch '3-2-15' into 3-2-secAaron Patterson2013-10-1516-28/+30
| |\
| | * bumping to rc3Aaron Patterson2013-10-119-9/+9
| | * Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"Rafael Mendonça França2013-10-104-10/+2
| | * Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"Rafael Mendonça França2013-10-102-14/+0
| | * bumping to rc2Aaron Patterson2013-10-049-9/+9
| | * Merge pull request #12443 from arthurnn/add_inverse_of_add_targetRafael Mendonça França2013-10-042-0/+14
| | * bumping version to 3.2.15.rc1Aaron Patterson2013-10-039-17/+17
| * | Merge branch '3-2-stable' into 3-2-secAaron Patterson2013-10-037-3/+29
| |\ \
| * | | Remove the use of String#% when formatting durations in log messagesMichael Koziarski2013-09-303-9/+12
* | | | Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"Rafael Mendonça França2013-10-104-10/+2
* | | | Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"Rafael Mendonça França2013-10-102-14/+0
* | | | Merge pull request #12443 from arthurnn/add_inverse_of_add_targetRafael Mendonça França2013-10-042-0/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | add regression test for set_inverse_instance on add_to_targetArthur Neves2013-10-041-0/+13
| * | | Add back set_inverse_instance on .add_to_targetArthur Neves2013-10-041-0/+1
|/ / /
* | | Merge pull request #12084 from Ben-M/3-2-stableAaron Patterson2013-10-033-1/+11
|\ \ \ | |_|/ |/| |