##// END OF EJS Templates
release: merge back stable branch into default
marcink -
r3843:957c2342 merge default
parent child
Show More
@@ -0,0 +1,41
1 |RCE| 4.17.1 |RNS|
2 ------------------
3
4 Release Date
5 ^^^^^^^^^^^^
6
7 - 2019-07-04
8
9
10 New Features
11 ^^^^^^^^^^^^
12
13
14
15 General
16 ^^^^^^^
17
18
19
20 Security
21 ^^^^^^^^
22
23
24
25 Performance
26 ^^^^^^^^^^^
27
28
29
30 Fixes
31 ^^^^^
32
33 - Database: fixed mysql migration issues.
34 - Artifacts: fixed problem with non-ascii file uploads.
35 - Artifacts: increase timeout, and allow setting custom time via ?timeout=N GET flag
36
37
38 Upgrade notes
39 ^^^^^^^^^^^^^
40
41 - Un-scheduled release addressing problems in 4.17.X releases.
@@ -0,0 +1,40
1 |RCE| 4.17.2 |RNS|
2 ------------------
3
4 Release Date
5 ^^^^^^^^^^^^
6
7 - 2019-07-05
8
9
10 New Features
11 ^^^^^^^^^^^^
12
13
14
15 General
16 ^^^^^^^
17
18
19
20 Security
21 ^^^^^^^^
22
23
24
25 Performance
26 ^^^^^^^^^^^
27
28
29
30 Fixes
31 ^^^^^
32
33 - UI: fixed missing icons on some cases.
34 - Commits: hide links icon of message that don't expand.
35
36
37 Upgrade notes
38 ^^^^^^^^^^^^^
39
40 - Un-scheduled release addressing problems in 4.17.X releases.
@@ -0,0 +1,2
1 big/CPython
2 big/CPython/commits
@@ -41,6 +41,7 syntax: regexp
41 ^result$
41 ^result$
42 ^rhodecode/public/css/style.css$
42 ^rhodecode/public/css/style.css$
43 ^rhodecode/public/css/style-polymer.css$
43 ^rhodecode/public/css/style-polymer.css$
44 ^rhodecode/public/css/style-ipython.css$
44 ^rhodecode/public/js/rhodecode-components.html$
45 ^rhodecode/public/js/rhodecode-components.html$
45 ^rhodecode/public/js/rhodecode-components.js$
46 ^rhodecode/public/js/rhodecode-components.js$
46 ^rhodecode/public/js/scripts.js$
47 ^rhodecode/public/js/scripts.js$
@@ -52,3 +52,6 4aaa40b605b01af78a9f6882eca561c54b525ef0
52 797744642eca86640ed20bef2cd77445780abaec v4.16.0
52 797744642eca86640ed20bef2cd77445780abaec v4.16.0
53 6c3452c7c25ed35ff269690929e11960ed6ad7d3 v4.16.1
53 6c3452c7c25ed35ff269690929e11960ed6ad7d3 v4.16.1
54 5d8057df561c4b6b81b6401aed7d2f911e6e77f7 v4.16.2
54 5d8057df561c4b6b81b6401aed7d2f911e6e77f7 v4.16.2
55 13acfc008896ef4c62546bab5074e8f6f89b4fa7 v4.17.0
56 45b9b610976f483877142fe75321808ce9ebac59 v4.17.1
57 ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901 v4.17.2
@@ -9,6 +9,8 Release Notes
9 .. toctree::
9 .. toctree::
10 :maxdepth: 1
10 :maxdepth: 1
11
11
12 release-notes-4.17.2.rst
13 release-notes-4.17.1.rst
12 release-notes-4.17.0.rst
14 release-notes-4.17.0.rst
13 release-notes-4.16.2.rst
15 release-notes-4.16.2.rst
14 release-notes-4.16.1.rst
16 release-notes-4.16.1.rst
@@ -1718,7 +1718,7 self: super: {
1718 };
1718 };
1719 };
1719 };
1720 "rhodecode-enterprise-ce" = super.buildPythonPackage {
1720 "rhodecode-enterprise-ce" = super.buildPythonPackage {
1721 name = "rhodecode-enterprise-ce-4.17.0";
1721 name = "rhodecode-enterprise-ce-4.17.2";
1722 buildInputs = [
1722 buildInputs = [
1723 self."pytest"
1723 self."pytest"
1724 self."py"
1724 self."py"
@@ -369,6 +369,10 def includeme(config):
369 name='edit_repo_perms',
369 name='edit_repo_perms',
370 pattern='/{repo_name:.*?[^/]}/settings/permissions', repo_route=True)
370 pattern='/{repo_name:.*?[^/]}/settings/permissions', repo_route=True)
371
371
372 config.add_route(
373 name='edit_repo_perms_set_private',
374 pattern='/{repo_name:.*?[^/]}/settings/permissions/set_private', repo_route=True)
375
372 # Permissions Branch (EE feature)
376 # Permissions Branch (EE feature)
373 config.add_route(
377 config.add_route(
374 name='edit_repo_perms_branch',
378 name='edit_repo_perms_branch',
@@ -481,13 +485,21 def includeme(config):
481 name='edit_repo_audit_logs',
485 name='edit_repo_audit_logs',
482 pattern='/{repo_name:.*?[^/]}/settings/audit_logs', repo_route=True)
486 pattern='/{repo_name:.*?[^/]}/settings/audit_logs', repo_route=True)
483
487
484 # ATOM/RSS Feed
488 # ATOM/RSS Feed, shouldn't contain slashes for outlook compatibility
485 config.add_route(
489 config.add_route(
486 name='rss_feed_home',
490 name='rss_feed_home',
491 pattern='/{repo_name:.*?[^/]}/feed-rss', repo_route=True)
492
493 config.add_route(
494 name='atom_feed_home',
495 pattern='/{repo_name:.*?[^/]}/feed-atom', repo_route=True)
496
497 config.add_route(
498 name='rss_feed_home_old',
487 pattern='/{repo_name:.*?[^/]}/feed/rss', repo_route=True)
499 pattern='/{repo_name:.*?[^/]}/feed/rss', repo_route=True)
488
500
489 config.add_route(
501 config.add_route(
490 name='atom_feed_home',
502 name='atom_feed_home_old',
491 pattern='/{repo_name:.*?[^/]}/feed/atom', repo_route=True)
503 pattern='/{repo_name:.*?[^/]}/feed/atom', repo_route=True)
492
504
493 # NOTE(marcink): needs to be at the end for catch-all
505 # NOTE(marcink): needs to be at the end for catch-all
@@ -27,8 +27,10 def route_path(name, params=None, **kwar
27 import urllib
27 import urllib
28
28
29 base_url = {
29 base_url = {
30 'rss_feed_home': '/{repo_name}/feed/rss',
30 'rss_feed_home': '/{repo_name}/feed-rss',
31 'atom_feed_home': '/{repo_name}/feed/atom',
31 'atom_feed_home': '/{repo_name}/feed-atom',
32 'rss_feed_home_old': '/{repo_name}/feed/rss',
33 'atom_feed_home_old': '/{repo_name}/feed/atom',
32 }[name].format(**kwargs)
34 }[name].format(**kwargs)
33
35
34 if params:
36 if params:
@@ -73,6 +75,42 class TestFeedView(TestController):
73
75
74 assert response.content_type == content_type
76 assert response.content_type == content_type
75
77
78 @pytest.mark.parametrize("feed_type, content_type", [
79 ('rss', "application/rss+xml"),
80 ('atom', "application/atom+xml")
81 ])
82 def test_feed_with_auth_token_by_uid(
83 self, backend, user_admin, feed_type, content_type):
84 auth_token = user_admin.feed_token
85 assert auth_token != ''
86
87 response = self.app.get(
88 route_path(
89 '{}_feed_home'.format(feed_type),
90 repo_name='_{}'.format(backend.repo.repo_id),
91 params=dict(auth_token=auth_token)),
92 status=200)
93
94 assert response.content_type == content_type
95
96 @pytest.mark.parametrize("feed_type, content_type", [
97 ('rss', "application/rss+xml"),
98 ('atom', "application/atom+xml")
99 ])
100 def test_feed_old_urls_with_auth_token(
101 self, backend, user_admin, feed_type, content_type):
102 auth_token = user_admin.feed_token
103 assert auth_token != ''
104
105 response = self.app.get(
106 route_path(
107 '{}_feed_home_old'.format(feed_type),
108 repo_name=backend.repo_name,
109 params=dict(auth_token=auth_token)),
110 status=200)
111
112 assert response.content_type == content_type
113
76 @pytest.mark.parametrize("feed_type", ['rss', 'atom'])
114 @pytest.mark.parametrize("feed_type", ['rss', 'atom'])
77 def test_feed_with_auth_token_of_wrong_type(
115 def test_feed_with_auth_token_of_wrong_type(
78 self, backend, user_util, feed_type):
116 self, backend, user_util, feed_type):
@@ -40,8 +40,6 log = logging.getLogger(__name__)
40 class RepoFeedView(RepoAppView):
40 class RepoFeedView(RepoAppView):
41 def load_default_context(self):
41 def load_default_context(self):
42 c = self._get_local_tmpl_context()
42 c = self._get_local_tmpl_context()
43
44
45 self._load_defaults()
43 self._load_defaults()
46 return c
44 return c
47
45
@@ -117,6 +115,9 class RepoFeedView(RepoAppView):
117 @view_config(
115 @view_config(
118 route_name='atom_feed_home', request_method='GET',
116 route_name='atom_feed_home', request_method='GET',
119 renderer=None)
117 renderer=None)
118 @view_config(
119 route_name='atom_feed_home_old', request_method='GET',
120 renderer=None)
120 def atom(self):
121 def atom(self):
121 """
122 """
122 Produce an atom-1.0 feed via feedgenerator module
123 Produce an atom-1.0 feed via feedgenerator module
@@ -181,6 +182,9 class RepoFeedView(RepoAppView):
181 @view_config(
182 @view_config(
182 route_name='rss_feed_home', request_method='GET',
183 route_name='rss_feed_home', request_method='GET',
183 renderer=None)
184 renderer=None)
185 @view_config(
186 route_name='rss_feed_home_old', request_method='GET',
187 renderer=None)
184 def rss(self):
188 def rss(self):
185 """
189 """
186 Produce an rss2 feed via feedgenerator module
190 Produce an rss2 feed via feedgenerator module
@@ -105,3 +105,30 class RepoSettingsPermissionsView(RepoAp
105
105
106 raise HTTPFound(
106 raise HTTPFound(
107 h.route_path('edit_repo_perms', repo_name=self.db_repo_name))
107 h.route_path('edit_repo_perms', repo_name=self.db_repo_name))
108
109 @LoginRequired()
110 @HasRepoPermissionAnyDecorator('repository.admin')
111 @CSRFRequired()
112 @view_config(
113 route_name='edit_repo_perms_set_private', request_method='POST',
114 renderer='json_ext')
115 def edit_permissions_set_private_repo(self):
116 _ = self.request.translate
117 self.load_default_context()
118
119 try:
120 RepoModel().update(
121 self.db_repo, **{'repo_private': True, 'repo_name': self.db_repo_name})
122 Session().commit()
123
124 h.flash(_('Repository `{}` private mode set successfully').format(self.db_repo_name),
125 category='success')
126 except Exception:
127 log.exception("Exception during update of repository")
128 h.flash(_('Error occurred during update of repository {}').format(
129 self.db_repo_name), category='error')
130
131 return {
132 'redirect_url': h.route_path('edit_repo_perms', repo_name=self.db_repo_name),
133 'private': True
134 }
This diff has been collapsed as it changes many lines, (3163 lines changed) Show them Hide them
@@ -6,9 +6,9
6 #, fuzzy
6 #, fuzzy
7 msgid ""
7 msgid ""
8 msgstr ""
8 msgstr ""
9 "Project-Id-Version: rhodecode-enterprise-ce 4.16.0\n"
9 "Project-Id-Version: rhodecode-enterprise-ce 4.17.0\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
11 "POT-Creation-Date: 2019-02-23 21:51+0000\n"
11 "POT-Creation-Date: 2019-07-03 14:48+0000\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,11 +25,11 msgstr ""
25 msgid "Error occurred during update of default values"
25 msgid "Error occurred during update of default values"
26 msgstr ""
26 msgstr ""
27
27
28 #: rhodecode/apps/admin/views/exception_tracker.py:142
28 #: rhodecode/apps/admin/views/exception_tracker.py:156
29 msgid "Removed {} Exceptions"
29 msgid "Removed {} Exceptions"
30 msgstr ""
30 msgstr ""
31
31
32 #: rhodecode/apps/admin/views/exception_tracker.py:159
32 #: rhodecode/apps/admin/views/exception_tracker.py:173
33 msgid "Removed Exception {}"
33 msgid "Removed Exception {}"
34 msgstr ""
34 msgstr ""
35
35
@@ -53,7 +53,7 msgstr ""
53
53
54 #: rhodecode/apps/admin/views/permissions.py:484
54 #: rhodecode/apps/admin/views/permissions.py:484
55 #: rhodecode/templates/admin/gists/show.mako:63
55 #: rhodecode/templates/admin/gists/show.mako:63
56 #: rhodecode/templates/admin/integrations/list.mako:174
56 #: rhodecode/templates/admin/integrations/list.mako:172
57 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5
57 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5
58 #: rhodecode/templates/base/issue_tracker_settings.mako:60
58 #: rhodecode/templates/base/issue_tracker_settings.mako:60
59 #: rhodecode/templates/data_table/_dt_elements.mako:167
59 #: rhodecode/templates/data_table/_dt_elements.mako:167
@@ -62,12 +62,12 msgstr ""
62 #: rhodecode/templates/data_table/_dt_elements.mako:255
62 #: rhodecode/templates/data_table/_dt_elements.mako:255
63 #: rhodecode/templates/data_table/_dt_elements.mako:267
63 #: rhodecode/templates/data_table/_dt_elements.mako:267
64 #: rhodecode/templates/debug_style/buttons.html:128
64 #: rhodecode/templates/debug_style/buttons.html:128
65 #: rhodecode/templates/files/files_add.mako:208
65 #: rhodecode/templates/files/files_add.mako:57
66 #: rhodecode/templates/files/files_edit.mako:168
66 #: rhodecode/templates/files/files_edit.mako:58
67 #: rhodecode/templates/files/files_source.mako:58
67 #: rhodecode/templates/files/files_source.mako:29
68 #: rhodecode/templates/files/files_source.mako:61
68 #: rhodecode/templates/files/files_source.mako:42
69 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64
69 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60
70 #: rhodecode/templates/pullrequests/pullrequest_show.mako:347
70 #: rhodecode/templates/pullrequests/pullrequest_show.mako:343
71 #: rhodecode/templates/user_group/profile.mako:7
71 #: rhodecode/templates/user_group/profile.mako:7
72 #: rhodecode/templates/users/user_profile.mako:7
72 #: rhodecode/templates/users/user_profile.mako:7
73 msgid "Edit"
73 msgid "Edit"
@@ -81,12 +81,12 msgstr ""
81 msgid "SSH key support is disabled in .ini file"
81 msgid "SSH key support is disabled in .ini file"
82 msgstr ""
82 msgstr ""
83
83
84 #: rhodecode/apps/admin/views/repo_groups.py:183
84 #: rhodecode/apps/admin/views/repo_groups.py:329
85 #, python-format
85 #, python-format
86 msgid "Created repository group %s"
86 msgid "Created repository group %s"
87 msgstr ""
87 msgstr ""
88
88
89 #: rhodecode/apps/admin/views/repo_groups.py:201
89 #: rhodecode/apps/admin/views/repo_groups.py:347
90 #, python-format
90 #, python-format
91 msgid "Error occurred during creation of repository group %s"
91 msgid "Error occurred during creation of repository group %s"
92 msgstr ""
92 msgstr ""
@@ -345,12 +345,12 msgstr ""
345 msgid "SVN"
345 msgid "SVN"
346 msgstr ""
346 msgstr ""
347
347
348 #: rhodecode/apps/admin/views/user_groups.py:231
348 #: rhodecode/apps/admin/views/user_groups.py:243
349 #, python-format
349 #, python-format
350 msgid "Created user group %(user_group_link)s"
350 msgid "Created user group %(user_group_link)s"
351 msgstr ""
351 msgstr ""
352
352
353 #: rhodecode/apps/admin/views/user_groups.py:253
353 #: rhodecode/apps/admin/views/user_groups.py:265
354 #, python-format
354 #, python-format
355 msgid "Error occurred during creation of user group %s"
355 msgid "Error occurred during creation of user group %s"
356 msgstr ""
356 msgstr ""
@@ -446,99 +446,99 msgstr ""
446 msgid "Force password change disabled for user"
446 msgid "Force password change disabled for user"
447 msgstr ""
447 msgstr ""
448
448
449 #: rhodecode/apps/admin/views/users.py:696
449 #: rhodecode/apps/admin/views/users.py:695
450 #, python-format
450 #, python-format
451 msgid "Linked repository group `%s` as personal"
451 msgid "Linked repository group `%s` as personal"
452 msgstr ""
452 msgstr ""
453
453
454 #: rhodecode/apps/admin/views/users.py:702
454 #: rhodecode/apps/admin/views/users.py:701
455 #, python-format
455 #, python-format
456 msgid "Created repository group `%s`"
456 msgid "Created repository group `%s`"
457 msgstr ""
457 msgstr ""
458
458
459 #: rhodecode/apps/admin/views/users.py:706
459 #: rhodecode/apps/admin/views/users.py:705
460 #, python-format
460 #, python-format
461 msgid "Repository group `%s` is already taken"
461 msgid "Repository group `%s` is already taken"
462 msgstr ""
462 msgstr ""
463
463
464 #: rhodecode/apps/admin/views/users.py:711
464 #: rhodecode/apps/admin/views/users.py:710
465 msgid "An error occurred during repository group creation for user"
465 msgid "An error occurred during repository group creation for user"
466 msgstr ""
466 msgstr ""
467
467
468 #: rhodecode/apps/admin/views/users.py:734
468 #: rhodecode/apps/admin/views/users.py:733
469 #: rhodecode/apps/my_account/views/my_account.py:161
469 #: rhodecode/apps/my_account/views/my_account.py:161
470 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
470 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
471 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
471 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
472 msgid "Role"
472 msgid "Role"
473 msgstr ""
473 msgstr ""
474
474
475 #: rhodecode/apps/admin/views/users.py:773
475 #: rhodecode/apps/admin/views/users.py:772
476 #: rhodecode/apps/my_account/views/my_account.py:196
476 #: rhodecode/apps/my_account/views/my_account.py:196
477 msgid "Auth token successfully created"
477 msgid "Auth token successfully created"
478 msgstr ""
478 msgstr ""
479
479
480 #: rhodecode/apps/admin/views/users.py:802
480 #: rhodecode/apps/admin/views/users.py:801
481 #: rhodecode/apps/my_account/views/my_account.py:220
481 #: rhodecode/apps/my_account/views/my_account.py:220
482 msgid "Auth token successfully deleted"
482 msgid "Auth token successfully deleted"
483 msgstr ""
483 msgstr ""
484
484
485 #: rhodecode/apps/admin/views/users.py:875
485 #: rhodecode/apps/admin/views/users.py:874
486 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114
486 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114
487 msgid "Ssh Key successfully created"
487 msgid "Ssh Key successfully created"
488 msgstr ""
488 msgstr ""
489
489
490 #: rhodecode/apps/admin/views/users.py:881
490 #: rhodecode/apps/admin/views/users.py:880
491 #: rhodecode/apps/admin/views/users.py:885
491 #: rhodecode/apps/admin/views/users.py:884
492 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:120
492 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:120
493 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:124
493 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:124
494 msgid "An error occurred during ssh key saving: {}"
494 msgid "An error occurred during ssh key saving: {}"
495 msgstr ""
495 msgstr ""
496
496
497 #: rhodecode/apps/admin/views/users.py:919
497 #: rhodecode/apps/admin/views/users.py:918
498 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154
498 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154
499 msgid "Ssh key successfully deleted"
499 msgid "Ssh key successfully deleted"
500 msgstr ""
500 msgstr ""
501
501
502 #: rhodecode/apps/admin/views/users.py:965
502 #: rhodecode/apps/admin/views/users.py:964
503 #, python-format
503 #, python-format
504 msgid "Added new email address `%s` for user account"
504 msgid "Added new email address `%s` for user account"
505 msgstr ""
505 msgstr ""
506
506
507 #: rhodecode/apps/admin/views/users.py:971
507 #: rhodecode/apps/admin/views/users.py:970
508 msgid "Email `{}` is already registered for another user."
508 msgid "Email `{}` is already registered for another user."
509 msgstr ""
509 msgstr ""
510
510
511 #: rhodecode/apps/admin/views/users.py:975
511 #: rhodecode/apps/admin/views/users.py:974
512 msgid "An error occurred during email saving"
512 msgid "An error occurred during email saving"
513 msgstr ""
513 msgstr ""
514
514
515 #: rhodecode/apps/admin/views/users.py:1002
515 #: rhodecode/apps/admin/views/users.py:1001
516 msgid "Removed email address from user account"
516 msgid "Removed email address from user account"
517 msgstr ""
517 msgstr ""
518
518
519 #: rhodecode/apps/admin/views/users.py:1048
519 #: rhodecode/apps/admin/views/users.py:1047
520 #, python-format
520 #, python-format
521 msgid "An error occurred during ip saving:%s"
521 msgid "An error occurred during ip saving:%s"
522 msgstr ""
522 msgstr ""
523
523
524 #: rhodecode/apps/admin/views/users.py:1070
524 #: rhodecode/apps/admin/views/users.py:1069
525 msgid "An error occurred during ip saving"
525 msgid "An error occurred during ip saving"
526 msgstr ""
526 msgstr ""
527
527
528 #: rhodecode/apps/admin/views/users.py:1074
528 #: rhodecode/apps/admin/views/users.py:1073
529 #, python-format
529 #, python-format
530 msgid "Added ips %s to user whitelist"
530 msgid "Added ips %s to user whitelist"
531 msgstr ""
531 msgstr ""
532
532
533 #: rhodecode/apps/admin/views/users.py:1104
533 #: rhodecode/apps/admin/views/users.py:1103
534 msgid "Removed ip address from user whitelist"
534 msgid "Removed ip address from user whitelist"
535 msgstr ""
535 msgstr ""
536
536
537 #: rhodecode/apps/admin/views/users.py:1169
537 #: rhodecode/apps/admin/views/users.py:1168
538 msgid "Groups successfully changed"
538 msgid "Groups successfully changed"
539 msgstr ""
539 msgstr ""
540
540
541 #: rhodecode/apps/admin/views/users.py:1263
541 #: rhodecode/apps/admin/views/users.py:1262
542 msgid "Deleted {} cache keys"
542 msgid "Deleted {} cache keys"
543 msgstr ""
543 msgstr ""
544
544
@@ -562,9 +562,9 msgstr ""
562 msgid "1 month"
562 msgid "1 month"
563 msgstr ""
563 msgstr ""
564
564
565 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:40932
565 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:44668
566 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
566 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
567 #: rhodecode/public/js/src/rhodecode.js:509
567 #: rhodecode/public/js/src/rhodecode.js:502
568 msgid "Lifetime"
568 msgid "Lifetime"
569 msgstr ""
569 msgstr ""
570
570
@@ -576,16 +576,16 msgstr ""
576 msgid "Can be accessed by anonymous users"
576 msgid "Can be accessed by anonymous users"
577 msgstr ""
577 msgstr ""
578
578
579 #: rhodecode/apps/gist/views.py:214
579 #: rhodecode/apps/gist/views.py:213
580 msgid "Error occurred during gist creation"
580 msgid "Error occurred during gist creation"
581 msgstr ""
581 msgstr ""
582
582
583 #: rhodecode/apps/gist/views.py:238
583 #: rhodecode/apps/gist/views.py:237
584 #, python-format
584 #, python-format
585 msgid "Deleted gist %s"
585 msgid "Deleted gist %s"
586 msgstr ""
586 msgstr ""
587
587
588 #: rhodecode/apps/gist/views.py:324
588 #: rhodecode/apps/gist/views.py:325
589 #: rhodecode/templates/admin/gists/show.mako:74
589 #: rhodecode/templates/admin/gists/show.mako:74
590 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36
590 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36
591 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
591 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
@@ -593,41 +593,42 msgstr ""
593 msgid "never"
593 msgid "never"
594 msgstr ""
594 msgstr ""
595
595
596 #: rhodecode/apps/gist/views.py:330
596 #: rhodecode/apps/gist/views.py:331
597 #, python-format
597 #, python-format
598 msgid "%(expiry)s - current value"
598 msgid "%(expiry)s - current value"
599 msgstr ""
599 msgstr ""
600
600
601 #: rhodecode/apps/gist/views.py:375
601 #: rhodecode/apps/gist/views.py:376
602 msgid "Successfully updated gist content"
602 msgid "Successfully updated gist content"
603 msgstr ""
603 msgstr ""
604
604
605 #: rhodecode/apps/gist/views.py:380
605 #: rhodecode/apps/gist/views.py:381
606 msgid "Successfully updated gist data"
606 msgid "Successfully updated gist data"
607 msgstr ""
607 msgstr ""
608
608
609 #: rhodecode/apps/gist/views.py:383
609 #: rhodecode/apps/gist/views.py:384
610 msgid "Error occurred during update of gist {}: {}"
610 msgid "Error occurred during update of gist {}: {}"
611 msgstr ""
611 msgstr ""
612
612
613 #: rhodecode/apps/gist/views.py:387
613 #: rhodecode/apps/gist/views.py:388
614 #, python-format
614 #, python-format
615 msgid "Error occurred during update of gist %s"
615 msgid "Error occurred during update of gist %s"
616 msgstr ""
616 msgstr ""
617
617
618 #: rhodecode/apps/home/views.py:308
618 #: rhodecode/apps/home/views.py:388
619 #: rhodecode/apps/repository/views/repo_pull_requests.py:878
619 #: rhodecode/apps/repository/views/repo_pull_requests.py:878
620 #: rhodecode/templates/admin/my_account/my_account.mako:42
620 #: rhodecode/templates/admin/my_account/my_account.mako:42
621 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
621 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
622 #: rhodecode/templates/admin/repos/repo_add.mako:15
622 #: rhodecode/templates/admin/repos/repo_add.mako:15
623 #: rhodecode/templates/admin/repos/repo_add.mako:19
623 #: rhodecode/templates/admin/repos/repo_add.mako:19
624 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
624 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
625 #: rhodecode/templates/base/base.mako:78 rhodecode/templates/base/base.mako:150
625 #: rhodecode/templates/base/base.mako:103
626 #: rhodecode/templates/base/base.mako:785
626 #: rhodecode/templates/base/base.mako:122
627 #: rhodecode/templates/base/base.mako:944
627 msgid "Repositories"
628 msgid "Repositories"
628 msgstr ""
629 msgstr ""
629
630
630 #: rhodecode/apps/home/views.py:335
631 #: rhodecode/apps/home/views.py:415
631 #: rhodecode/templates/admin/integrations/form.mako:17
632 #: rhodecode/templates/admin/integrations/form.mako:17
632 #: rhodecode/templates/admin/integrations/list.mako:10
633 #: rhodecode/templates/admin/integrations/list.mako:10
633 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31
634 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31
@@ -695,11 +696,11 msgstr ""
695 msgid "Failed to update bookmarks. Make sure an unique position is used"
696 msgid "Failed to update bookmarks. Make sure an unique position is used"
696 msgstr ""
697 msgstr ""
697
698
698 #: rhodecode/apps/my_account/views/my_account.py:626
699 #: rhodecode/apps/my_account/views/my_account.py:629
699 msgid "Your account was updated successfully"
700 msgid "Your account was updated successfully"
700 msgstr ""
701 msgstr ""
701
702
702 #: rhodecode/apps/my_account/views/my_account.py:633
703 #: rhodecode/apps/my_account/views/my_account.py:636
703 msgid "Error occurred during update of user"
704 msgid "Error occurred during update of user"
704 msgstr ""
705 msgstr ""
705
706
@@ -746,9 +747,8 msgid "There are no commits yet"
746 msgstr ""
747 msgstr ""
747
748
748 #: rhodecode/apps/repository/views/repo_changelog.py:71
749 #: rhodecode/apps/repository/views/repo_changelog.py:71
749 #: rhodecode/apps/repository/views/repo_commits.py:111
750 #: rhodecode/apps/repository/views/repo_files.py:165
751 #: rhodecode/apps/repository/views/repo_files.py:185
750 #: rhodecode/apps/repository/views/repo_files.py:185
751 #: rhodecode/apps/repository/views/repo_files.py:205
752 msgid "No such commit exists for this repository"
752 msgid "No such commit exists for this repository"
753 msgstr ""
753 msgstr ""
754
754
@@ -767,13 +767,17 msgstr ""
767 msgid "Created repository %s"
767 msgid "Created repository %s"
768 msgstr ""
768 msgstr ""
769
769
770 #: rhodecode/apps/repository/views/repo_commits.py:327
770 #: rhodecode/apps/repository/views/repo_commits.py:110
771 msgid "No such commit exists. Org exception: `{}`"
772 msgstr ""
773
774 #: rhodecode/apps/repository/views/repo_commits.py:326
771 #: rhodecode/apps/repository/views/repo_pull_requests.py:1347
775 #: rhodecode/apps/repository/views/repo_pull_requests.py:1347
772 #, python-format
776 #, python-format
773 msgid "Status change %(transition_icon)s %(status)s"
777 msgid "Status change %(transition_icon)s %(status)s"
774 msgstr ""
778 msgstr ""
775
779
776 #: rhodecode/apps/repository/views/repo_commits.py:372
780 #: rhodecode/apps/repository/views/repo_commits.py:371
777 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
781 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
778 msgstr ""
782 msgstr ""
779
783
@@ -793,11 +797,11 msgstr ""
793 msgid "The comparison of two different kinds of remote repos is not available"
797 msgid "The comparison of two different kinds of remote repos is not available"
794 msgstr ""
798 msgstr ""
795
799
796 #: rhodecode/apps/repository/views/repo_compare.py:231
800 #: rhodecode/apps/repository/views/repo_compare.py:225
797 msgid "Could not compare repos with different large file settings"
801 msgid "Could not compare repos with different large file settings"
798 msgstr ""
802 msgstr ""
799
803
800 #: rhodecode/apps/repository/views/repo_compare.py:277
804 #: rhodecode/apps/repository/views/repo_compare.py:271
801 #, python-format
805 #, python-format
802 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
806 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
803 msgstr ""
807 msgstr ""
@@ -812,122 +816,130 msgstr ""
812 msgid "%s %s feed"
816 msgid "%s %s feed"
813 msgstr ""
817 msgstr ""
814
818
815 #: rhodecode/apps/repository/views/repo_files.py:95
819 #: rhodecode/apps/repository/views/repo_files.py:96
816 #, python-format
820 #, python-format
817 msgid "This repository has been locked by %s on %s"
821 msgid "This repository has been locked by %s on %s"
818 msgstr ""
822 msgstr ""
819
823
820 #: rhodecode/apps/repository/views/repo_files.py:111
824 #: rhodecode/apps/repository/views/repo_files.py:109
825 msgid "Cannot modify file. Given commit `{}` is not head of a branch."
826 msgstr ""
827
828 #: rhodecode/apps/repository/views/repo_files.py:127
821 msgid "Branch `{}` changes forbidden by rule {}."
829 msgid "Branch `{}` changes forbidden by rule {}."
822 msgstr ""
830 msgstr ""
823
831
824 #: rhodecode/apps/repository/views/repo_files.py:155
832 #: rhodecode/apps/repository/views/repo_files.py:175
825 msgid "Click here to add a new file."
833 msgid "Click here to add a new file."
826 msgstr ""
834 msgstr ""
827
835
828 #: rhodecode/apps/repository/views/repo_files.py:160
836 #: rhodecode/apps/repository/views/repo_files.py:180
829 #, python-format
837 #, python-format
830 msgid "There are no files yet. %s"
838 msgid "There are no files yet. %s"
831 msgstr ""
839 msgstr ""
832
840
833 #: rhodecode/apps/repository/views/repo_files.py:297
841 #: rhodecode/apps/repository/views/repo_files.py:325
834 msgid "Downloads disabled"
842 msgid "Downloads disabled"
835 msgstr ""
843 msgstr ""
836
844
837 #: rhodecode/apps/repository/views/repo_files.py:303
845 #: rhodecode/apps/repository/views/repo_files.py:331
838 msgid "Unknown archive type for: `{}`"
846 msgid "Unknown archive type for: `{}`"
839 msgstr ""
847 msgstr ""
840
848
841 #: rhodecode/apps/repository/views/repo_files.py:309
849 #: rhodecode/apps/repository/views/repo_files.py:337
842 msgid "Unknown commit_id {}"
850 msgid "Unknown commit_id {}"
843 msgstr ""
851 msgstr ""
844
852
845 #: rhodecode/apps/repository/views/repo_files.py:312
853 #: rhodecode/apps/repository/views/repo_files.py:340
846 msgid "Empty repository"
854 msgid "Empty repository"
847 msgstr ""
855 msgstr ""
848
856
849 #: rhodecode/apps/repository/views/repo_files.py:344
857 #: rhodecode/apps/repository/views/repo_files.py:345
858 msgid "No node at path {} for this repository"
859 msgstr ""
860
861 #: rhodecode/apps/repository/views/repo_files.py:394
850 msgid "Unknown archive type"
862 msgid "Unknown archive type"
851 msgstr ""
863 msgstr ""
852
864
853 #: rhodecode/apps/repository/views/repo_files.py:915
865 #: rhodecode/apps/repository/views/repo_files.py:963
854 msgid "Changesets"
866 msgid "Changesets"
855 msgstr ""
867 msgstr ""
856
868
857 #: rhodecode/apps/repository/views/repo_files.py:936
869 #: rhodecode/apps/repository/views/repo_files.py:984
858 #: rhodecode/apps/repository/views/repo_summary.py:341
870 #: rhodecode/apps/repository/views/repo_summary.py:346
859 #: rhodecode/model/pull_request.py:1431 rhodecode/model/scm.py:916
871 #: rhodecode/model/pull_request.py:1456 rhodecode/model/scm.py:918
860 #: rhodecode/templates/base/vcs_settings.mako:235
872 #: rhodecode/templates/base/vcs_settings.mako:235
873 #: rhodecode/templates/summary/components.mako:10
861 msgid "Branches"
874 msgid "Branches"
862 msgstr ""
875 msgstr ""
863
876
864 #: rhodecode/apps/repository/views/repo_files.py:940 rhodecode/model/scm.py:931
877 #: rhodecode/apps/repository/views/repo_files.py:988 rhodecode/model/scm.py:933
865 #: rhodecode/templates/base/vcs_settings.mako:260
878 #: rhodecode/templates/base/vcs_settings.mako:260
879 #: rhodecode/templates/summary/components.mako:34
866 msgid "Tags"
880 msgid "Tags"
867 msgstr ""
881 msgstr ""
868
882
869 #: rhodecode/apps/repository/views/repo_files.py:1039
883 #: rhodecode/apps/repository/views/repo_files.py:1092
870 #: rhodecode/apps/repository/views/repo_files.py:1073
884 #: rhodecode/apps/repository/views/repo_files.py:1120
871 msgid "You can only delete files with commit being a valid branch head."
872 msgstr ""
873
874 #: rhodecode/apps/repository/views/repo_files.py:1050
875 #: rhodecode/apps/repository/views/repo_files.py:1084
876 msgid "Deleted file {} via RhodeCode Enterprise"
885 msgid "Deleted file {} via RhodeCode Enterprise"
877 msgstr ""
886 msgstr ""
878
887
879 #: rhodecode/apps/repository/views/repo_files.py:1105
888 #: rhodecode/apps/repository/views/repo_files.py:1141
880 msgid "Successfully deleted file `{}`"
889 msgid "Successfully deleted file `{}`"
881 msgstr ""
890 msgstr ""
882
891
883 #: rhodecode/apps/repository/views/repo_files.py:1109
892 #: rhodecode/apps/repository/views/repo_files.py:1145
884 #: rhodecode/apps/repository/views/repo_files.py:1235
893 #: rhodecode/apps/repository/views/repo_files.py:1262
885 #: rhodecode/apps/repository/views/repo_files.py:1393
894 #: rhodecode/apps/repository/views/repo_files.py:1393
895 #: rhodecode/apps/repository/views/repo_files.py:1516
886 msgid "Error occurred during commit"
896 msgid "Error occurred during commit"
887 msgstr ""
897 msgstr ""
888
898
889 #: rhodecode/apps/repository/views/repo_files.py:1129
899 #: rhodecode/apps/repository/views/repo_files.py:1177
890 #: rhodecode/apps/repository/views/repo_files.py:1169
900 #: rhodecode/apps/repository/views/repo_files.py:1208
891 msgid "You can only edit files with commit being a valid branch head."
892 msgstr ""
893
894 #: rhodecode/apps/repository/views/repo_files.py:1147
895 #: rhodecode/apps/repository/views/repo_files.py:1188
896 msgid "Edited file {} via RhodeCode Enterprise"
901 msgid "Edited file {} via RhodeCode Enterprise"
897 msgstr ""
902 msgstr ""
898
903
899 #: rhodecode/apps/repository/views/repo_files.py:1206
900 msgid "No changes"
901 msgstr ""
902
903 #: rhodecode/apps/repository/views/repo_files.py:1231
904 #: rhodecode/apps/repository/views/repo_files.py:1231
904 msgid "Successfully committed changes to file `{}`"
905 msgid "No changes detected on {}"
905 msgstr ""
906 msgstr ""
906
907
907 #: rhodecode/apps/repository/views/repo_files.py:1255
908 #: rhodecode/apps/repository/views/repo_files.py:1255
908 #: rhodecode/apps/repository/views/repo_files.py:1318
909 msgid "Successfully committed changes to file `{}`"
910 msgstr ""
911
912 #: rhodecode/apps/repository/views/repo_files.py:1296
913 #: rhodecode/apps/repository/views/repo_files.py:1337
909 msgid "Added file via RhodeCode Enterprise"
914 msgid "Added file via RhodeCode Enterprise"
910 msgstr ""
915 msgstr ""
911
916
912 #: rhodecode/apps/repository/views/repo_files.py:1268
917 #: rhodecode/apps/repository/views/repo_files.py:1353
913 #: rhodecode/apps/repository/views/repo_files.py:1309
918 msgid "No filename specified"
914 msgid "You can only add files with commit being a valid branch head."
919 msgstr ""
915 msgstr ""
920
916
921 #: rhodecode/apps/repository/views/repo_files.py:1378
917 #: rhodecode/apps/repository/views/repo_files.py:1351
918 msgid "No filename"