Commit 99ec007d authored by Mayra Cabrera's avatar Mayra Cabrera

Re-adjust code for EE

parent 1afb5cf3
......@@ -27,6 +27,7 @@ integrated platform
- [Protected tags](protected_tags.md): Control over who has
permission to create tags, and prevent accidental update or deletion
- [Signing commits](gpg_signed_commits/index.md): use GPG to sign your commits
- [Deploy tokens](deploy_tokens/index.md): Manage project-based deploy tokens that allow permanent access to the repository and Container Registry.
- **(Ultimate)** [Web IDE](web_ide/index.md)
**Issues and merge requests:**
......@@ -34,7 +35,6 @@ integrated platform
- [Issue tracker](issues/index.md): Discuss implementations with your team within issues
- [Issue Boards](issue_board.md): Organize and prioritize your workflow
- [Multiple Issue Boards](issue_board.md#multiple-issue-boards) (**Starter/Premium**): Allow your teams to create their own workflows (Issue Boards) for the same project
- [Deploy tokens](deploy_tokens/index.md): Manage project-based deploy tokens that allow permanent access to the repository and Container Registry.
- [Merge Requests](merge_requests/index.md): Apply your branching
strategy and get reviewed by your team
- [Merge Request Approvals](merge_requests/merge_request_approvals.md) (**Starter/Premium**): Ask for approval before
......
......@@ -8,6 +8,7 @@ import CEProtectedBranchEditList from '~/protected_branches/protected_branch_edi
import CEProtectedTagCreate from '~/protected_tags/protected_tag_create';
import CEProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
import MirrorPull from 'ee/mirrors/mirror_pull';
import DueDateSelectors from '~/due_date_select';
import ProtectedBranchCreate from 'ee/protected_branches/protected_branch_create';
import ProtectedBranchEditList from 'ee/protected_branches/protected_branch_edit_list';
......@@ -40,4 +41,6 @@ document.addEventListener('DOMContentLoaded', () => {
if (mirrorPull) {
mirrorPull.init();
}
new DueDateSelectors();
});
......@@ -39,6 +39,19 @@ module EE
gon.push(current_project_id: project.id) if project
end
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def render_show
@deploy_keys = ::Projects::Settings::DeployKeysPresenter.new(@project, current_user: current_user)
@deploy_tokens = @project.deploy_tokens.active
define_deploy_token
define_protected_refs
push_rule
remote_mirror
render 'show'
end
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment