aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #7951 from Grandrath/patch-1Carlos Antonio da Silva2012-10-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Don't use test environment by default when running rake db:structure:load; #7951Martin Grandrath2012-10-181-1/+1
* | | | We don't need this anymore since we had a sprockets-rails releaseRafael Mendonça França2012-10-191-3/+0
* | | | Merge pull request #7995 from adimichele/masterRafael Mendonça França2012-10-192-1/+10
|\ \ \ \
| * | | | Changed scope for "taken" error message translation to decrease precedenceAndrew DiMichele2012-10-192-1/+10
* | | | | Merge pull request #7997 from steveklabnik/issue_733Rafael Mendonça França2012-10-192-11/+24
|\ \ \ \ \
| * | | | | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-10-192-11/+24
| |/ / / /
* | | | | Merge pull request #7996 from yahonda/revert_7994Rafael Mendonça França2012-10-191-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "truncate debug.log on each test run"Yasuo Honda2012-10-201-2/+1
|/ / / /
* | | | Merge pull request #7994 from frodsan/truncate_debug_logRafael Mendonça França2012-10-191-1/+2
|\ \ \ \
| * | | | truncate debug.log on each test runFrancesco Rodriguez2012-10-191-1/+2
* | | | | Get rid of the ActiveRecord::Model::DeprecationProxy thing.Jon Leighton2012-10-1915-88/+28
|/ / / /
* | | | Update rails gemspec to use sprockets-rails 2.0.0.rc1Carlos Antonio da Silva2012-10-191-1/+1
* | | | Rename the partial_updates config to partial_writesJon Leighton2012-10-195-23/+53
* | | | nodoc the first_or_create methods and document alternativesJon Leighton2012-10-194-68/+50
* | | | fix test :/Jon Leighton2012-10-191-5/+1
* | | | The default value of a text/blob in mysql strict mode should be nilJon Leighton2012-10-196-48/+70
* | | | Add Relation#find_or_create_by and friendsJon Leighton2012-10-195-22/+133
* | | | synchronize on param filter cache.Aaron Patterson2012-10-181-2/+7
* | | | add another singleton for environment filteringAaron Patterson2012-10-181-3/+8
* | | | oops, forgot the default parameterAaron Patterson2012-10-181-1/+1
* | | | keep a singleton filter around that we can use when no filter is setAaron Patterson2012-10-181-2/+6
* | | | move compiled filters to their own class so that recursive calls don'tAaron Patterson2012-10-181-41/+45
* | | | nil isn't a valid filterAaron Patterson2012-10-181-1/+0
* | | | prevent people from accidentally modifying the filter wordAaron Patterson2012-10-181-1/+1
* | | | simplify filter enabled checkingAaron Patterson2012-10-181-9/+4
* | | | if no filters are supplied, default to an empty listAaron Patterson2012-10-181-1/+1
* | | | initialize required instance variables for this mixinAaron Patterson2012-10-181-2/+7
* | | | There is already a Set of non-hidden action_names lying around.thedarkone2012-10-181-8/+2
* | | | eagerly populate the http method loookup cache so we don't need locksAaron Patterson2012-10-181-1/+7
* | | | move cache inside the instance so we do not need lockingAaron Patterson2012-10-181-9/+12
* | | | add test for fetch with a blockAaron Patterson2012-10-182-2/+6
* | | | prefer composition over inheritenceAaron Patterson2012-10-182-11/+31
* | | | fix assertionsAaron Patterson2012-10-181-2/+2
* | | | Make DescendantsTracker thread safe and optimize the #descendants method.thedarkone2012-10-183-30/+51
* | | | some ruby interpreters don't have ruby-prof so just skip the testsAaron Patterson2012-10-182-4/+13
* | | | Merge pull request #7975 from butcher/extend_date_select_helper_functionalityRafael Mendonça França2012-10-183-0/+24
|\ \ \ \
| * | | | Extend date_select helper functionality.Pavel Nikitin2012-10-183-0/+22
* | | | | Remove warning setting eager_loadRafael Mendonça França2012-10-181-0/+1
* | | | | Don't use action_controller.perform_caching to enable rack-rack.Rafael Mendonça França2012-10-183-7/+14
* | | | | Fix the app_generator and plugin_new testsRafael Mendonça França2012-10-182-1/+4
* | | | | Merge pull request #7990 from mrbrdo/masterRafael Mendonça França2012-10-181-1/+1
|\ \ \ \ \
| * | | | | add credit to committer of pull request #6569Jan Berdajs2012-10-181-1/+1
|/ / / / /
* | | | | Merge pull request #7969 from senny/active_model_validations_requires_necessa...Rafael Mendonça França2012-10-181-5/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | active_model/validations requires necessary files to runYves Senn2012-10-181-0/+1
| * | | | cleanup, replace non-breaking spaces with spacesYves Senn2012-10-181-5/+5
|/ / / /
* | | | Now the Sprockets railtie lives in sprockets/railtieRafael Mendonça França2012-10-184-4/+4
* | | | Permit string and float values in the multiparameter attributesRafael Mendonça França2012-10-182-10/+15
* | | | Typecast to string and array are not supported in multiparameterRafael Mendonça França2012-10-181-3/+2
* | | | Change back to official sprockets-railsJoshua Peek2012-10-172-3/+3