diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 18:01:54 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 18:01:54 +0300 |
| commit | a1c45338f37560b044f23f1af07fea7bef2107cd (patch) | |
| tree | ad9deb2fe7158f1cd52f9599255c013784eae8c0 /features/steps/dashboard | |
| parent | ab2e67550b350efb73a397a53040ec9c46966b0d (diff) | |
| parent | 5e4384ec9bc5e015c6a5427e337d8f5412e91d1e (diff) | |
Merge branch 'support-edit-target-branch-in-mr' into 'master'
Support editing target branch of merge request
### What does this MR do?
This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens.
### Why was this MR needed?
Because lots of people requested this feature. :)
### Screenshots
**Edit MR page**
**New MR page**
**System note**
### What are the relevant issue numbers?
* Closes https://github.com/gitlabhq/gitlabhq/issues/7105
* See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130!
See merge request !738
Diffstat (limited to 'features/steps/dashboard')
| -rw-r--r-- | features/steps/dashboard/dashboard.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb index 8508b2a8096..bb1f2f444f9 100644 --- a/features/steps/dashboard/dashboard.rb +++ b/features/steps/dashboard/dashboard.rb @@ -23,8 +23,8 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps step 'I see prefilled new Merge Request page' do current_path.should == new_namespace_project_merge_request_path(@project.namespace, @project) find("#merge_request_target_project_id").value.should == @project.id.to_s - find("#merge_request_source_branch").value.should == "fix" - find("#merge_request_target_branch").value.should == "master" + find("input#merge_request_source_branch").value.should == "fix" + find("input#merge_request_target_branch").value.should == "master" end step 'user with name "John Doe" joined project "Shop"' do |