diff options
| author | Phil Hughes <me@iamphill.com> | 2018-01-12 15:32:26 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-01-16 11:49:25 +0000 |
| commit | d9764a5ce4945505c69742ec74597b45bfd0898d (patch) | |
| tree | f0a807eb1ca78464e2d151bb3224446e5a9c794c | |
| parent | a369988b4a2551e7214660b6ea4161f02381ab30 (diff) | |
| download | gitlab-ce-d9764a5ce4945505c69742ec74597b45bfd0898d.tar.gz | |
more spec fixes
| -rw-r--r-- | app/views/projects/merge_requests/creations/_new_submit.html.haml | 1 | ||||
| -rw-r--r-- | app/views/shared/issuable/form/_branch_chooser.html.haml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml index 4b5fa28078a..43cc877acec 100644 --- a/app/views/projects/merge_requests/creations/_new_submit.html.haml +++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml @@ -15,7 +15,6 @@ = f.hidden_field :source_project_id = f.hidden_field :source_branch = f.hidden_field :target_project_id - = f.hidden_field :target_branch .mr-compare.merge-request.js-merge-request-new-submit{ 'data-mr-submit-action': "#{j params[:tab].presence || 'new'}" } - if @commits.empty? diff --git a/app/views/shared/issuable/form/_branch_chooser.html.haml b/app/views/shared/issuable/form/_branch_chooser.html.haml index b7e30e5b836..9a589387255 100644 --- a/app/views/shared/issuable/form/_branch_chooser.html.haml +++ b/app/views/shared/issuable/form/_branch_chooser.html.haml @@ -17,7 +17,6 @@ .issuable-form-select-holder = form.hidden_field(:target_branch, { class: 'target_branch js-target-branch-select ref-name', - id: '', disabled: issuable.new_record?, data: { placeholder: "Select branch", endpoint: refs_project_path(@project, sort: 'updated_desc', find: 'branches') }}) - if issuable.new_record? |