aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | need to delete bin, not binstub, update wordingAndre Arko2013-03-271-4/+4
| * | | script/rails could never be from bundlerAndre Arko2013-03-271-1/+1
| * | | rails commands even if bin/rails is a gem stubAndre Arko2013-03-201-10/+20
* | | | Fix typoRafael Mendonça França2013-04-091-2/+2
* | | | Merge pull request #10153 from choudhuryanupam/masterRafael Mendonça França2013-04-091-4/+0
|\ \ \ \
| * | | | Removed unused setupAnupam Choudhury2013-04-091-4/+0
|/ / / /
* | | | Merge pull request #10142 from wangjohn/grouping_thread_localsRafael Mendonça França2013-04-092-9/+16
|\ \ \ \
| * | | | Delegating the value getter and setters in the ScopeRegistry to thewangjohn2013-04-082-9/+16
* | | | | Merge pull request #10151 from neerajdotname/ar-to-klassRafael Mendonça França2013-04-094-12/+12
|\ \ \ \ \
| * | | | | changed variable name active_record => base_klassNeeraj Singh2013-04-094-12/+12
* | | | | | Merge pull request #10138 from hbakhtiyor/test-dirs-environmentRafael Mendonça França2013-04-091-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add TEST_DIRS enviroment for constrain test directories in rakefileAbd ar-Rahman Hamidi2013-04-081-2/+3
* | | | | | Merge pull request #10148 from vipulnsward/traces_changeCarlos Antonio da Silva2013-04-091-6/+4
|\ \ \ \ \ \
| * | | | | | change array of array to hashVipul A M2013-04-091-6/+4
* | | | | | | Merge pull request #10147 from vipulnsward/fix_AP_live_warningCarlos Antonio da Silva2013-04-082-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix AP warning; remove unused variableVipul A M2013-04-092-1/+2
|/ / / / / /
* | | | | | Merge pull request #10145 from wangjohn/instrumentation_registry_creationRafael Mendonça França2013-04-081-1/+27
|\ \ \ \ \ \
| * | | | | | Creating an object to consolidate thread locals which hold thewangjohn2013-04-081-1/+27
|/ / / / / /
* | | | | | Merge pull request #10143 from Agis-/mark_unused_varsRafael Mendonça França2013-04-089-13/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Mark unused variables and make some style fixesAgis Anastasopoulos2013-04-089-13/+13
|/ / / / /
* | | | | Merge pull request #10135 from wangjohn/grouping_thread_localsRafael Mendonça França2013-04-083-6/+57
|\ \ \ \ \
| * | | | | Grouping thread locals in the ActiveRecord scopes so that thewangjohn2013-04-083-6/+57
|/ / / / /
* | | | | Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-082-1/+103
|\ \ \ \ \
| * | | | | Exception handling for controllers using ActionController::LiveSean Griffin2013-03-182-1/+103
* | | | | | Merge pull request #10122 from wangjohn/adding_documentation_to_form_builderRafael Mendonça França2013-04-081-2/+55
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Added documentation to the FormBuilder class, should helpwangjohn2013-04-061-2/+55
* | | | | | Merge pull request #10130 from Agis-/patch-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ \ \ \ \
| * | | | | | Remove unused block parametersAgis Anastasopoulos2013-04-071-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #10131 from Agis-/metal_helperCarlos Antonio da Silva2013-04-081-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove unecessary variable call, `#sort!` always returns an arrayAgis Anastasopoulos2013-04-071-1/+0
|/ / / / /
* | | | | Minor AR changelog improvements [ci skip]Carlos Antonio da Silva2013-04-071-4/+3
* | | | | Avoid iterating over records hash when not necessaryCarlos Antonio da Silva2013-04-071-2/+6
* | | | | Merge pull request #10127 from vipulnsward/each_to_each_valueCarlos Antonio da Silva2013-04-072-3/+3
|\ \ \ \ \
| * | | | | each to each_value; remove unused varsVipul A M2013-04-072-3/+3
|/ / / / /
* | | | | Merge pull request #10123 from wangjohn/added_bang_to_raise_nested_attributes...Carlos Antonio da Silva2013-04-061-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added a bang to the end of +raise_nested_attributes_record_not_found+wangjohn2013-04-061-3/+3
|/ / / /
* | | | Merge pull request #10101 from wangjohn/refactoring_routing_mapperAndrew White2013-04-061-12/+13
|\ \ \ \
| * | | | Refactoring some reused code into a method (inside of the routeswangjohn2013-04-051-12/+13
* | | | | Forgot to lock the uglifier version in our GemfileRafael Mendonça França2013-04-061-1/+1
* | | | | Merge pull request #10121 from Agis-/patch-2Rafael Mendonça França2013-04-061-1/+1
|\ \ \ \ \
| * | | | | Fix markdown formattingAgis Anastasopoulos2013-04-061-1/+1
* | | | | | Merge pull request #10120 from vipulnsward/change_merge_on_new_hashRafael Mendonça França2013-04-061-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
* | | | | | sprockets 2.9.x doesn't work with uglifier 2.0 yet.Rafael Mendonça França2013-04-061-2/+2
* | | | | | Merge pull request #10113 from Agis-/default_scopes_predicateRafael Mendonça França2013-04-066-6/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Deprecate ActiveRecord#Base.default_scopes?Agis-2013-04-062-1/+15
| * | | | | Add option to Class#class_attribute for skipping the query methodAgis-2013-04-064-5/+20
|/ / / / /
* | | | | Bring back ActiveRecord::Base#connection_handler removed by mistake on b37399abRafael Mendonça França2013-04-061-0/+4
* | | | | Merge pull request #10118 from vipulnsward/remove_unused_var_taskCarlos Antonio da Silva2013-04-062-2/+1
|\ \ \ \ \
| * | | | | remove unused variablesVipul A M2013-04-062-2/+1