aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Provide arguments to RecordNotFoundNikita Misharin2017-11-254-7/+35
* Add master key to `gitignore` on `rails new`yuuji.yaginuma2017-11-164-1/+19
* Bump resque-scheduler ahead of a new gem releaseJeremy Daer2017-11-151-2/+2
* Pass options onto key file generator.Kasper Timm Hansen2017-11-151-1/+1
* Merge branch 'freeletics-manage-multiple-credential-files'Kasper Timm Hansen2017-11-159-41/+337
|\
| * Add CLI to manage encrypted files/configs.Wojciech Wnętrzak2017-11-1510-50/+347
* | Go through a single credentials instance.Kasper Timm Hansen2017-11-151-9/+10
* | Merge pull request #31160 from yahonda/ignored_column_case_insensitiveRafael França2017-11-151-1/+1
|\ \
| * | Allow test_ignored_columns_not_included_in_SELECT column names caseYasuo Honda2017-11-151-1/+1
|/ /
* | Merge pull request #31128 from rails/handle-ambigious-timesAndrew White2017-11-154-1/+66
|\ \
| * | Handle `TZInfo::AmbiguousTime` errorsAndrew White2017-11-154-1/+66
* | | Merge pull request #29776 from mrj/fix-idlw-timezoneMatthew Draper2017-11-151-1/+1
|\ \ \ | |/ / |/| |
| * | Change the "International Date Line West" TZInfo timezone from "Pacific/Midwa...Mark James2017-07-131-1/+1
* | | These strings should already be frozen where ruby accepts the magic-commentAkira Matsuda2017-11-151-2/+2
* | | Merge pull request #31156 from kwstannard/patch-1Rafael França2017-11-141-1/+1
|\ \ \
| * | | Update configuring.mdKelly Stannard2017-11-141-1/+1
* | | | Use released arelyuuji.yaginuma2017-11-156-6/+0
|/ / /
* | | Fix asset url examples [ci skip]Ryuta Kamizono2017-11-151-6/+6
* | | Fix CI failure due to invalid `up_only` for MySQLRyuta Kamizono2017-11-151-5/+7
* | | Fix typo s/only_up/up_only/ [ci skip]Ryuta Kamizono2017-11-151-1/+1
* | | Merge pull request #30004 from npenzin/patch-1Yuji Yaginuma2017-11-152-2/+3
|\ \ \
| * | | Ensure plugin_generator adds to new line in GemfileNikita Penzin2017-11-142-2/+3
* | | | Merge pull request #31155 from bogdanvlviv/fix-activesupport-changelogRafael França2017-11-141-27/+29
|\ \ \ \
| * | | | Fix activesupport/CHANGELOG.md [ci skip]bogdanvlviv2017-11-141-27/+29
* | | | | Merge pull request #31154 from bogdanvlviv/fix-migration-version-in-doc-of-up...Rafael França2017-11-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix migration version in doc of #up_onlybogdanvlviv2017-11-141-1/+1
|/ / / /
* | | | Use released sass-railsRafael Mendonça França2017-11-142-15/+9
* | | | Use released arelRafael Mendonça França2017-11-144-17/+9
* | | | Merge pull request #30963 from q-centrix/performance-improvements-add_method_...Rafael França2017-11-141-1/+14
|\ \ \ \
| * | | | Performance improvements for add_method_to_attributes!Dillon Welch2017-11-071-1/+14
* | | | | Add a #populate method to migrations (#31082)Rich2017-11-143-0/+48
* | | | | Merge pull request #31153 from koic/ci_against_jruby_9_1_14_0Ryuta Kamizono2017-11-151-3/+3
|\ \ \ \ \
| * | | | | CI against JRuby 9.1.14.0Koichi ITO2017-11-151-3/+3
|/ / / / /
* | | | | Introduce ActiveStorage::Attached::{One,Many}#detachGeorge Claghorn2017-11-143-7/+40
* | | | | Merge pull request #31151 from nikolai-b/exists_docRyuta Kamizono2017-11-141-1/+2
|\ \ \ \ \
| * | | | | Update `exists?` documentationNikolai B2017-11-141-1/+2
* | | | | | Merge pull request #30884 from robwold/patch-1Eileen M. Uchitelle2017-11-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update layouts_and_rendering.md [ci skip]Rob2017-11-141-1/+1
* | | | | | Merge pull request #27947 from mastahyeti/unsafe_raw_sqlMatthew Draper2017-11-1413-33/+462
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | use database agnostic function/quoting in testBen Toews2017-11-091-4/+4
| * | | | | push order arg checks down to allow for bindsBen Toews2017-11-093-28/+47
| * | | | | deal with Array arguments to #orderBen Toews2017-11-093-4/+22
| * | | | | convert order arg to string before checking if we can reverse itBen Toews2017-11-092-2/+6
| * | | | | use << instead of #concat in #reverse_sql_order because we might be working w...Ben Toews2017-11-092-2/+2
| * | | | | try using regexesBen Toews2017-11-0927-166/+120
| * | | | | allow table name and direction in string order argBen Toews2017-11-0927-244/+295
| * | | | | work around deprecation warnings in a bunch of testsBen Toews2017-11-0934-313/+320
| * | | | | always allow Arel::Attributes::Attribute alsoBen Toews2017-11-091-1/+3
| * | | | | call enforce_raw_sql_whitelist on @klass so it works with FakeKlassBen Toews2017-11-091-2/+2
| * | | | | work with actual string when reversing orderBen Toews2017-11-091-0/+3