aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #22967 from schneems/schneems/generic-metadataSean Griffin2016-01-0817-14/+253
|\ \ \ \ \ \
| * | | | | | Fixing tests and re-locating error checking.schneems2016-01-085-16/+17
| * | | | | | Fix kwarg to not have circular dependencyschneems2016-01-081-1/+1
| * | | | | | Use hash like syntax for InternalMetadataschneems2016-01-086-14/+12
| * | | | | | Add EnvironmentMismatchErrorschneems2016-01-082-4/+25
| * | | | | | Use `key` as primary key in schema.schneems2016-01-081-1/+1
| * | | | | | [ci skip] Add comment to remove silenced code.schneems2016-01-071-0/+1
| * | | | | | Prevent destructive action on production databaseschneems2016-01-0716-14/+232
* | | | | | | Merge pull request #22977 from rails/revert-22934-masterDavid Heinemeier Hansson2016-01-0815-46/+36
|\ \ \ \ \ \ \
| * | | | | | | Revert "Move async execution from celluloid to concurrent-ruby"David Heinemeier Hansson2016-01-0815-46/+36
|/ / / / / / /
* | | | | | | Merge pull request #22934 from mperham/masterDavid Heinemeier Hansson2016-01-0815-36/+46
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | don't need explicit dep and a pretty neat pickMike Perham2016-01-052-2/+1
| * | | | | | Use Module#thread_mattr_accessorMike Perham2016-01-051-8/+6
| * | | | | | Remove celluloid referencesMike Perham2016-01-056-6/+1
| * | | | | | Move async execution from celluloid to concurrent-rubyMike Perham2016-01-059-30/+48
* | | | | | | [doc] The capture method isn't always used inside views to create a variableAkira Matsuda & saya2016-01-081-2/+2
* | | | | | | Merge pull request #22973 from kamipo/fix_select_values_method_signatureRafael França2016-01-082-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix `select_values` method signature for consistencyRyuta Kamizono2016-01-082-4/+4
* | | | | | | | Merge pull request #22971 from kamipo/insert_sql_is_almost_same_as_insertRafael França2016-01-084-25/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | `{update|delete}_sql` are almost the same as `{update|delete}`Ryuta Kamizono2016-01-084-25/+2
* | | | | | | | | Merge pull request #22972 from prathamesh-sonpatki/fix-typoRafael França2016-01-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix typo in ActionPack CHANGELOG [ci skip]Prathamesh Sonpatki2016-01-081-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #18909 from davidcornu/fix-hash-with-indifferent-access-de...Sean Griffin2016-01-073-8/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Match HashWithIndifferentAccess#default's behaviour with Hash#defaultDavid Cornu2016-01-073-8/+24
|/ / / / / / / /
* | | | | | | | Merge pull request #22966 from mastahyeti/add_gregRafael França2016-01-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | add gregBen Toews2016-01-071-1/+1
|/ / / / / / /
* | | | | | | Ensure `config.active_record.time_zone_aware_types` is always setSean Griffin2016-01-071-0/+1
* | | | | | | Merge pull request #22942 from Edouard-chin/rake-routes-error-messageKasper Timm Hansen2016-01-073-7/+64
|\ \ \ \ \ \ \
| * | | | | | | Better error message when running `rake routes` with CONTROLLER arg:Edouard CHIN2016-01-073-7/+64
|/ / / / / / /
* | | | | | | Merge pull request #20109 from prathamesh-sonpatki/keep-only-one-rootKasper Timm Hansen2016-01-071-21/+21
|\ \ \ \ \ \ \
| * | | | | | | Kept overridden root method and removed original methodPrathamesh Sonpatki2016-01-071-21/+21
* | | | | | | | Merge pull request #22956 from prathamesh-sonpatki/rm-splat-warningKasper Timm Hansen2016-01-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove splat operator warning from ssl_testPrathamesh Sonpatki2016-01-071-1/+1
* | | | | | | | | Merge pull request #22949 from schneems/schneems/request-idDavid Heinemeier Hansson2016-01-072-1/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Default new apps to tag logs with `request_id`schneems2016-01-062-1/+19
* | | | | | | | | Merge pull request #22903 from prathamesh-sonpatki/allow-ac-parameters-hash-a...Rafael França2016-01-073-2/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow AC::Parameters as an argument to url_helpersPrathamesh Sonpatki2016-01-073-2/+40
* | | | | | | | | | Merge pull request #22954 from yui-knk/suppress_warning_on_action_viewRafael França2016-01-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Suppress warning (instance variable @persisted not initialized)yui-knk2016-01-071-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #22952 from Baron-burton/contributing_documentationRafael França2016-01-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Typo in Contributing.md documentationBaron-burton2016-01-061-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #22948 from kamipo/remove_delete_sql_in_sqlite3_adapterRafael França2016-01-061-5/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove `delete_sql` in sqlite3 adapterRyuta Kamizono2016-01-071-5/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #22945 from kamipo/refactor_connection_insert_sqlRafael França2016-01-064-35/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor `connection.insert_sql`Ryuta Kamizono2016-01-074-35/+10
|/ / / / / / / /
* | | | | | | | Merge pull request #22933 from schneems/schneems/fix-broadcastRichard Schneeman2016-01-066-50/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused instance variableschneems2016-01-061-1/+0
| * | | | | | | | [close #22917] Don't output to `STDOUT` twiceschneems2016-01-064-7/+29
| * | | | | | | | Revert "Add Logger option to disable message broadcasts"schneems2016-01-053-45/+22
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #22941 from lsylvester/pg-remove-index-legacyMatthew Draper2016-01-072-2/+19
|\ \ \ \ \ \ \ \