diff options
| author | Denis Denisov <denji@users.noreply.github.com> | 2017-02-21 17:02:10 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-02-21 23:02:10 +0800 |
| commit | fd941db246e66244ec81f43d74b8358c06173fd6 (patch) | |
| tree | be563ff04f3b809b2d11489447086d5251e9b55a /options | |
| parent | fe5ff8e4b2b3c951fa85572f3760ee2a396247ac (diff) | |
| download | gitea-fd941db246e66244ec81f43d74b8358c06173fd6.tar.gz gitea-fd941db246e66244ec81f43d74b8358c06173fd6.zip | |
Protected branches system (#339)
* Protected branches system
* Moved default branch to branches section (`:org/:reponame/settings/branches`).
* Initial support Protected Branch.
- Admin does not restrict
- Owner not to limit
- To write permission restrictions
* reformat tmpl
* finished the UI and add/delete protected branch response
* remove unused comment
* indent all the template files and remove ru translations since we use crowdin
* fix the push bug
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/TRANSLATORS | 4 | ||||
| -rw-r--r-- | options/locale/locale_en-US.ini | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/options/locale/TRANSLATORS b/options/locale/TRANSLATORS index 651c830997..b8354d0a55 100644 --- a/options/locale/TRANSLATORS +++ b/options/locale/TRANSLATORS @@ -49,10 +49,12 @@ Muhammad Fawwaz Orabi <mfawwaz93 AT gmail DOT com> Nakao Takamasa <at.mattenn AT gmail DOT com> Natan Albuquerque <natanalbuquerque5 AT gmail DOT com> Odilon Junior <odilon DOT junior93 AT gmail DOT com> +Pablo Saavedra <psaavedra AT igalia DOT com> Richard Bukovansky <richard DOT bukovansky @ gmail DOT com> Robert Nuske <robert DOT nuske AT web DOT de> Robin Hübner <profan AT prfn DOT se> SeongJae Park <sj38 DOT park AT gmail DOT com> +Thiago Avelino <thiago AT avelino DOT xxx> Thomas Fanninger <gogs DOT thomas AT fanninger DOT at> Tilmann Bach <tilmann AT outlook DOT com> Toni Villena Jiménez <tonivj5 AT gmail DOT com> @@ -60,5 +62,3 @@ Vladimir Jigulin mogaika AT yandex DOT ru Vladimir Vissoultchev <wqweto AT gmail DOT com> YJSoft <yjsoft AT yjsoft DOT pe DOT kr> Łukasz Jan Niemier <lukasz AT niemier DOT pl> -Pablo Saavedra <psaavedra AT igalia DOT com> -Thiago Avelino <thiago AT avelino DOT xxx> diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9ae5f369b2..d33e5ea984 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -814,6 +814,18 @@ settings.add_key_success = New deploy key '%s' has been added successfully! settings.deploy_key_deletion = Delete Deploy Key settings.deploy_key_deletion_desc = Deleting this deploy key will remove all related accesses for this repository. Do you want to continue? settings.deploy_key_deletion_success = Deploy key has been deleted successfully! +settings.branches=Branches +settings.protected_branch=Branch Protection +settings.protected_branch_can_push=Allow push? +settings.protected_branch_can_push_yes=You can push +settings.protected_branch_can_push_no=You can not push +settings.add_protected_branch=Enable protection +settings.delete_protected_branch=Disable protection +settings.add_protected_branch_success=%s Locked successfully +settings.add_protected_branch_failed= %s Locked failed +settings.remove_protected_branch_success=%s Unlocked successfully +settings.protected_branch_deletion=To delete a protected branch +settings.protected_branch_deletion_desc=Anyone with write permissions will be able to push directly to this branch. Are you sure? diff.browse_source = Browse Source diff.parent = parent |