diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-26 12:22:09 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-26 12:23:29 +0100 |
| commit | 4b812d979eafa244c9e6b014448bf09bf1b458fd (patch) | |
| tree | 85edae3ce2e7c190d1d014ff161e9ce76be85391 | |
| parent | 480fcb5533e59151a6e9ae11baef59ebab64cc6c (diff) | |
| download | gitlab-ce-4b812d979eafa244c9e6b014448bf09bf1b458fd.tar.gz | |
Fixed failing specs
| -rw-r--r-- | app/controllers/concerns/milestone_actions.rb | 8 | ||||
| -rw-r--r-- | spec/controllers/projects/milestones_controller_spec.rb | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/controllers/concerns/milestone_actions.rb b/app/controllers/concerns/milestone_actions.rb index 2cc7e15c27d..3e2a0fe4f8b 100644 --- a/app/controllers/concerns/milestone_actions.rb +++ b/app/controllers/concerns/milestone_actions.rb @@ -3,7 +3,7 @@ module MilestoneActions def merge_requests respond_to do |format| - format.html { redirect_to milestone_path } + format.html { redirect_to milestone_redirect_path } format.json do render json: tabs_json("shared/milestones/_merge_requests_tab", { merge_requests: @milestone.merge_requests, @@ -15,7 +15,7 @@ module MilestoneActions def participants respond_to do |format| - format.html { redirect_to milestone_path } + format.html { redirect_to milestone_redirect_path } format.json do render json: tabs_json("shared/milestones/_participants_tab", { users: @milestone.participants @@ -26,7 +26,7 @@ module MilestoneActions def labels respond_to do |format| - format.html { redirect_to milestone_path } + format.html { redirect_to milestone_redirect_path } format.json do render json: tabs_json("shared/milestones/_labels_tab", { labels: @milestone.labels @@ -43,7 +43,7 @@ module MilestoneActions } end - def milestone_path + def milestone_redirect_path if @project namespace_project_milestone_path(@project.namespace, @project, @milestone) else diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb index 6f500468f95..84a61b2784e 100644 --- a/spec/controllers/projects/milestones_controller_spec.rb +++ b/spec/controllers/projects/milestones_controller_spec.rb @@ -52,6 +52,4 @@ describe Projects::MilestonesController do expect(last_note).to eq('removed milestone') end end - - end |