diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -10,6 +10,8 @@ Changelog - performance upgrade for cached repos list - gui optimizations - main page quick filter for filtering repositories +- more detailed action logger (based on hooks) with pushed changesets lists +- a lot of fixes for file browser 1.0.0 (**2010-11-02**) ---------------------- diff --git a/docs/upgrade.rst b/docs/upgrade.rst --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -24,6 +24,9 @@ Then make sure You run from the installa This will display any changes made from new version of RhodeCode To your current config. And tries to do an automerge. +It's also good to rebuild the whoosh index since after upgrading the whoosh +versionthere could be introduced incompatible index changes + .. _virtualenv: http://pypi.python.org/pypi/virtualenv .. _python: http://www.python.org/ diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py --- a/rhodecode/controllers/admin/settings.py +++ b/rhodecode/controllers/admin/settings.py @@ -173,13 +173,21 @@ class SettingsController(BaseController) .filter(RhodeCodeUi.ui_key == 'changegroup.repo_size').one() hgsettings4.ui_active = bool(form_result['hooks_changegroup_repo_size']) + hgsettings5 = self.sa.query(RhodeCodeUi)\ + .filter(RhodeCodeUi.ui_key == 'pretxnchangegroup.push_logger').one() + hgsettings5.ui_active = bool(form_result['hooks_pretxnchangegroup_push_logger']) + hgsettings6 = self.sa.query(RhodeCodeUi)\ + .filter(RhodeCodeUi.ui_key == 'preoutgoing.pull_logger').one() + hgsettings6.ui_active = bool(form_result['hooks_preoutgoing_pull_logger']) self.sa.add(hgsettings1) self.sa.add(hgsettings2) self.sa.add(hgsettings3) self.sa.add(hgsettings4) + self.sa.add(hgsettings5) + self.sa.add(hgsettings6) self.sa.commit() h.flash(_('Updated mercurial settings'), diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py --- a/rhodecode/model/forms.py +++ b/rhodecode/model/forms.py @@ -348,6 +348,8 @@ def ApplicationUiSettingsForm(): paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=1, not_empty=True)) hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False) hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False) + hooks_pretxnchangegroup_push_logger = OneOf(['True', 'False'], if_missing=False) + hooks_preoutgoing_pull_logger = OneOf(['True', 'False'], if_missing=False) return _ApplicationUiSettingsForm diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -2315,7 +2315,7 @@ padding:0 !important; #q_filter{ border:0 none; -color:#CDCDCD; +color:#AAAAAA; margin-bottom:-4px; margin-top:-4px; padding-left:3px; diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -136,7 +136,15 @@