Skip to content

G
gitlab-ce
Commit d906f8e6 authored by Robert Speicher's avatar Robert Speicher
Browse files
Options

Resolve app/assets/javascripts/projects/project_new.js

parent 2ae82d92
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/projects/project_new.js
View file @ d906f8e6
...@@ -147,15 +147,12 @@ const bindEvents = () => { ...@@ -147,15 +147,12 @@ const bindEvents = () => {
$projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl)); $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl));
<<<<<<< HEAD
$('.js-import-git-toggle-button').on('click', () => { $('.js-import-git-toggle-button').on('click', () => {
const $projectMirror = $('#project_mirror'); const $projectMirror = $('#project_mirror');
$projectMirror.attr('disabled', !$projectMirror.attr('disabled')); $projectMirror.attr('disabled', !$projectMirror.attr('disabled'));
}); });
=======
>>>>>>> upstream/master
$projectName.on('keyup change', () => { $projectName.on('keyup change', () => {
onProjectNameChange($projectName, $projectPath); onProjectNameChange($projectName, $projectPath);
hasUserDefinedProjectPath = $projectPath.val().trim().length > 0; hasUserDefinedProjectPath = $projectPath.val().trim().length > 0;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7