aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused raw email fixturesclaudiob2013-09-1215-736/+0
* Merge pull request #12201 from chancancode/json_loadJeremy Kemper2013-09-112-3/+16
|\
| * Replace JSON.load with JSON.parse, also removed the proc parameterGodfrey Chan2013-09-112-3/+16
* | these are not real developer objects, so counting them doesn't makeAaron Patterson2013-09-111-1/+1
* | Remove conditional adding a new methodRafael Mendonça França2013-09-112-6/+6
* | Fix inverted conditionalRafael Mendonça França2013-09-111-1/+1
* | Remove invalid commentRafael Mendonça França2013-09-111-4/+0
* | Check if the SQL is not a prepared statementRafael Mendonça França2013-09-1110-7/+29
|/
* Merge pull request #12188 from SamSaffron/masterAaron Patterson2013-09-114-12/+16
|\
| * Perf: avoid dupes add fallback logic for codersSam2013-09-114-12/+16
* | Merge pull request #12200 from dchelimsky/simplify-duration-inspect-even-moreRafael Mendonça França2013-09-112-6/+7
|\ \
| * | Reduce Duration#inspect to a single series of transformationsDavid Chelimsky2013-09-112-6/+7
* | | Merge pull request #12135 from dylanahsmith/avoid_empty_transactionRafael Mendonça França2013-09-113-1/+10
|\ \ \
| * | | Avoid empty transaction from setting has_one association on new record.Dylan Thacker-Smith2013-09-113-1/+9
* | | | WhitespacesRafael Mendonça França2013-09-111-1/+2
* | | | Merge pull request #12185 from SamSaffron/join_depRafael Mendonça França2013-09-111-1/+13
|\ \ \ \
| * | | | Reduce allocations when extracting AR modelsSam2013-09-111-1/+13
* | | | | Merge pull request #12194 from thedarkone/readonly-merger-fixRafael Mendonça França2013-09-113-1/+17
|\ \ \ \ \
| * | | | | Relation#merge should not lose readonly(false) flag.thedarkone2013-09-113-1/+17
* | | | | | Revert "Add meta tag with charset information to application layout."Aaron Patterson2013-09-111-1/+0
* | | | | | fix deleting join models with no pkAaron Patterson2013-09-112-6/+62
| |_|/ / / |/| | | |
* | | | | Merge pull request #12199 from michaelminter/masterRafael Mendonça França2013-09-111-1/+1
|\ \ \ \ \
| * | | | | remove sentence errmichaelminter2013-09-111-1/+1
|/ / / / /
* | | | | Merge pull request #12184 from waynn/patch-4Steve Klabnik2013-09-101-1/+1
|\ \ \ \ \
| * | | | | [ci skip] 'previous version of Rails' is gramatically incorrectWaynn Lue2013-09-101-1/+1
| | |/ / / | |/| | |
* | | | | Add meta tag with charset information to application layout.Steve Klabnik2013-09-101-0/+1
* | | | | add a comment for sanity of other people to comeAaron Patterson2013-09-101-0/+8
* | | | | ask the association for records rather than calling `send`Aaron Patterson2013-09-101-1/+2
* | | | | Merge pull request #12193 from arunagw/revert-revertRafael Mendonça França2013-09-1019-41/+33
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use Ruby 2.0 caller_locations instead of caller if availableAkira Matsuda2013-09-101-2/+7
| * | | | Update Rails 3.2.x guide link [ci skip]Tomas Varaneckas2013-09-101-1/+1
| * | | | Be sure to restore the default I18n.locale after changed its value in a testAkira Matsuda2013-09-101-3/+3
| * | | | Fixes typo in Object#try!Jay Hayes2013-09-101-1/+1
| * | | | More unused associations in AR test modelsAkira Matsuda2013-09-108-13/+0
| * | | | :scissors: [ci skip]Carlos Antonio da Silva2013-09-101-1/+1
| * | | | change function def self.table_name to self.table_nameRajarshi Das2013-09-102-5/+3
| * | | | Clean up unused associations in AR test modelAkira Matsuda2013-09-101-3/+0
| * | | | Reset ActionView::Base.logger instead of AC::Base.loggerAkira Matsuda2013-09-101-1/+1
| * | | | Refactor handling of action normalizationMax Shytikov2013-09-101-11/+13
| * | | | Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-09-102-1/+4
|/ / / /
* | | | Merge pull request #12189 from rajcybage/test_assertSantiago Pastorino2013-09-101-7/+7
|\ \ \ \
| * | | | use assert_empty in activemodel conditional validation test casesRajarshi Das2013-09-101-7/+7
* | | | | Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commitGuillermo Iguaran2013-09-104-11/+17
|\ \ \ \ \
| * | | | | Back AV description in gemspecArun Agrawal2013-09-091-1/+1
| * | | | | Fix order dependent testArun Agrawal2013-09-091-2/+10
| * | | | | grab executable from rubygemsArun Agrawal2013-09-091-1/+1
| * | | | | Fixed API task fileArun Agrawal2013-09-091-7/+5
* | | | | | Make AC standalone rendering workSantiago Pastorino2013-09-102-2/+20
| |/ / / / |/| | | |
* | | | | Merge pull request #12187 from anupamc/masterCarlos Antonio da Silva2013-09-102-8/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removed unused modules and classesAnupam Choudhury2013-09-101-7/+0