aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'rm-fix-secret-token-fallback'Rafael Mendonça França2014-11-109-23/+143
|\ \ \ \ \
| * | | | | :scissors:Rafael Mendonça França2014-11-101-1/+1
| * | | | | No need to sync config.secret_token and secrets.secret_tokenRafael Mendonça França2014-11-102-41/+4
| * | | | | Merge pull request #16535 from bf4/patch-1Rafael Mendonça França2014-11-109-23/+180
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | `secret_token` is now saved in `Rails.application.secrets.secret_token`Benjamin Fleischer2014-11-029-23/+180
* | | | | | dependencies.rb: keep the decorated #load and #require private [closes #17553]Xavier Noria2014-11-103-13/+36
* | | | | | Merge pull request #17585 from aderyabin/remove_limited_update_conditionsRafael Mendonça França2014-11-102-8/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove never called method `limited_update_conditions`Andrey Deryabin2014-11-112-8/+0
* | | | | | Merge pull request #17579 from aderyabin/cleanup_sqliteRafael Mendonça França2014-11-101-6/+2
|\ \ \ \ \ \
| * | | | | | tiny code improvement in sqlite3 adapter:Andrey Deryabin2014-11-101-6/+2
| |/ / / / /
* | | | | | Merge pull request #17578 from codeodor/fix-17217-test-bugRafael Mendonça França2014-11-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fixes a bug found when running individual tests against #17217 after mergingSammy Larbi2014-11-101-1/+1
| |/ / / / /
* | | | | | Merge pull request #11694 from Empact/association-bind-values-not-updated-on-...Rafael Mendonça França2014-11-103-1/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix that a collection proxy could be cached before the save of the owner, res...Ben Woosley2014-10-033-1/+20
* | | | | | docs, minor changes in Active Job documentation. [ci skip]Yves Senn2014-11-102-6/+5
* | | | | | Remove useless `only_path: true` in path helpersGodfrey Chan2014-11-101-3/+2
* | | | | | Pass the route name explicitlyGodfrey Chan2014-11-102-1/+14
* | | | | | Revert the behavior of booleans in string columns to that of 4.1Sean Griffin2014-11-093-7/+29
* | | | | | Merge pull request #17572 from rishijain/update_docs_10Zachary Scott2014-11-093-1/+5
|\ \ \ \ \ \
| * | | | | | added description for rails generators, and fixed sentence formation for acti...Rishi Jain2014-11-103-1/+5
|/ / / / / /
* | | | | | Merge pull request #17217 from codeodor/fix-17119Aaron Patterson2014-11-097-3/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Ensure HABTM relationships produce valid class names (Fixes #17119)Sammy Larbi2014-11-097-3/+25
|/ / / / /
* | | | | Merge pull request #17564 from yui-knk/fix/command_line_guideRobin Dupret2014-11-091-1/+1
|\ \ \ \ \
| * | | | | [ci skip] Fix typo in command_line.mdyui-knk2014-11-091-1/+1
|/ / / / /
* | | | | Merge pull request #17563 from yui-knk/fix/source_annotation_extractorZachary Scott2014-11-081-3/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix comment of SourceAnnotationExtractor#find_inyui-knk2014-11-091-3/+2
|/ / / /
* | | | Documenting Rails::Info module [ci skip]Zachary Scott2014-11-081-0/+3
* | | | Merge pull request #17557 from yui-knk/fix/command_line_guideVijay Dev2014-11-081-6/+2
|\ \ \ \
| * | | | [ci skip] Fix line break on command line guideyui-knk2014-11-081-6/+2
* | | | | Merge pull request #17559 from alfa-jpn/fix/singular_association_cacheSantiago Pastorino2014-11-082-1/+31
|\ \ \ \ \
| * | | | | default scopes should break the cache on singulur_association.alfa-jpn2014-11-082-1/+31
| |/ / / /
* | | | | Merge pull request #17476 from robin850/job-testingRobin Dupret2014-11-081-0/+62
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a section about job testing [ci skip]Ryan Selk2014-11-021-0/+62
* | | | | Merge pull request #17493 from petewest/duration-comparableAaron Patterson2014-11-072-0/+14
|\ \ \ \ \
| * | | | | Delegate comparison operator to valuePeter West2014-11-032-0/+14
* | | | | | default scopes should break the cache on has_many.Aaron Patterson2014-11-072-1/+28
* | | | | | Merge pull request #17552 from jipe/masterYves Senn2014-11-071-1/+1
|\ \ \ \ \ \
| * | | | | | Guides: Corrected name for assigns key [ci skip]Jimmy Petersen2014-11-071-1/+1
|/ / / / / /
* | | | | | pg tests, get rid of `sql_types_test.rb`.Yves Senn2014-11-073-18/+14
* | | | | | pg tests, only execute what's necessary.Yves Senn2014-11-072-27/+26
* | | | | | remove the last traces of OpenBase from our codebase. [ci skip]Yves Senn2014-11-071-6/+0
* | | | | | docs, the abstract data type `:timestamp` was removed. See #15184 [ci skip]Yves Senn2014-11-071-2/+2
* | | | | | Merge pull request #17551 from y-yagi/fix_command_line_guideZachary Scott2014-11-071-2/+2
|\ \ \ \ \ \
| * | | | | | [ci skip] modify default host in command line guideyuuji.yaginuma2014-11-071-2/+2
|/ / / / / /
* | | | | | Merge pull request #17541 from OpenSourceProjects/meaninful_messageYves Senn2014-11-073-5/+15
|\ \ \ \ \ \
| * | | | | | Print out a meaningful error when ActiveRecord::ReadOnlyRecord is raisedFranky W2014-11-062-5/+8
|/ / / / / /
* | | | | | Merge pull request #17545 from marzapower/dirty_public_apiRafael Mendonça França2014-11-061-1/+1
|\ \ \ \ \ \
| * | | | | | [Enh] Changed the visibility of the ActiveModel::Dirty#clear_attribute_change...Daniele Di Bernardo2014-11-061-1/+1
* | | | | | | Merge pull request #17543 from rishijain/update_docs_9Rafael Mendonça França2014-11-062-5/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | added example of hash#except, and removed extra whitespaces [ci skip]Rishi Jain2014-11-072-5/+11
|/ / / / / /