diff --git a/docs/installation_win.rst b/docs/installation_win.rst --- a/docs/installation_win.rst +++ b/docs/installation_win.rst @@ -47,7 +47,7 @@ choose "Visual C++ 2008 Express" when in required, you can uncheck them .. note:: - + 64bit: You also need to install the Microsoft Windows SDK for .NET 3.5 SP1 (.NET 4.0 won't work). Download from: http://www.microsoft.com/en-us/download/details.aspx?id=3138 @@ -90,7 +90,7 @@ http://sourceforge.net/projects/pywin32/ .. note:: 64bit: Download and install the 64bit version. - At the time of writing you can find this at: + At the time of writing you can find this at: http://sourceforge.net/projects/pywin32/files/pywin32/Build%20218/pywin32-218.win-amd64-py2.7.exe/download Step4 - Python BIN diff --git a/docs/theme/nature/static/pygments.css b/docs/theme/nature/static/pygments.css --- a/docs/theme/nature/static/pygments.css +++ b/docs/theme/nature/static/pygments.css @@ -51,4 +51,4 @@ .vc { color: #ff99ff } /* Name.Variable.Class */ .vg { color: #ff99ff } /* Name.Variable.Global */ .vi { color: #ff99ff } /* Name.Variable.Instance */ -.il { color: #009999 } /* Literal.Number.Integer.Long */ \ No newline at end of file +.il { color: #009999 } /* Literal.Number.Integer.Long */ diff --git a/docs/usage/performance.rst b/docs/usage/performance.rst --- a/docs/usage/performance.rst +++ b/docs/usage/performance.rst @@ -46,19 +46,17 @@ 3. Scale RhodeCode horizontally large traffic (large amount of users, CI servers etc). RhodeCode can be scaled horizontally on one (recommended) or multiple machines. In order to scale horizontally you need to do the following: - + - each instance needs it's own .ini file and unique `instance_id` set in them - - each instance `data` storage needs to be configured to be stored on a + - each instance `data` storage needs to be configured to be stored on a shared disk storage, preferably together with repositories. This `data` dir contains template caches, sessions, whoosh index and it's used for tasks locking (so it's safe across multiple instances). Set the `cache_dir`, `index_dir`, `beaker.cache.data_dir`, `beaker.cache.lock_dir` - variables in each .ini file to shared location across RhodeCode instances + variables in each .ini file to shared location across RhodeCode instances - if celery is used each instance should run separate celery instance, but the message broken should be common to all of them (ex one rabbitmq - shared server) + shared server) - load balance using round robin or ip hash, recommended is writing LB rules that will separate regular user traffic from automated processes like CI servers or build bots. - - diff --git a/requires.txt b/requires.txt --- a/requires.txt +++ b/requires.txt @@ -17,4 +17,4 @@ docutils==0.8.1 simplejson==2.5.2 mock py-bcrypt -mercurial==2.3.0 \ No newline at end of file +mercurial==2.3.0 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 @@ -314,7 +314,7 @@ div:hover > a.permalink { background-color: #003B76; opacity: 0.01; cursor: pointer; - min-height: 10px; + min-height: 10px; width: 100% !important; -webkit-border-radius: 0px 0px 4px 4px; -khtml-border-radius: 0px 0px 4px 4px; @@ -326,7 +326,7 @@ div:hover > a.permalink { opacity: 0.2; -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; - transition: opacity 0.5s ease-in-out; + transition: opacity 0.5s ease-in-out; } #header #header-inner { @@ -359,7 +359,7 @@ div:hover > a.permalink { -moz-border-radius: 0px 0px 0px 0px; border-radius: 0px 0px 0px 0px; position: fixed !important; - z-index: 10000; + z-index: 10000; } .ie7 #header #header-inner.hover, @@ -2154,7 +2154,7 @@ a.metatag[tag="license"]:hover { #quick_login .unread a { color: #FFFFFF; display: block; - padding: 2px; + padding: 2px; } #quick_login .notifications a:hover, #quick_login .unread a:hover { diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -153,7 +153,7 @@ var show_pullrequests = function(e){ ypjax(url, 'pullrequests_container', function(){ YUE.on('show_closed','change',function (e) { show_pullrequests(e); - }); + }); }); } YUE.on('show_pullrequests','click',function(e){ diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -26,7 +26,7 @@ %if c.pull_request.is_closed(): %endif - + ${_('Title')}: ${c.pull_request.title}