Skip to content

Commit

Permalink
Merge pull request #668 from k41n/fix_dependensies
Browse files Browse the repository at this point in the history
Fix dependensies and tests
  • Loading branch information
k41n authored Sep 19, 2016
2 parents 70ee550 + 439e3db commit d455f35
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ GEM
faker (0.3.1)
ffi (1.9.14-java)
gchartrb (0.8)
gherkin (2.12.2)
gherkin (2.12.2-java)
multi_json (~> 1.3)
gli (2.14.0)
Expand Down
8 changes: 4 additions & 4 deletions app/controllers/tasks_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ def new
redirect_to edit_task_path(@task.task_num)
else
flash[:error] = t('.task_was_not_created')
render 'tasks/index'
redirect_to tasks_path
end

rescue => e
flash[:error] = e.message
render 'tasks/index'
redirect_to tasks_path
end

def create
Expand Down Expand Up @@ -452,12 +452,12 @@ def clone
redirect_to edit_task_path(@task.task_num)
else
flash[:error] = t('.task_was_not_created')
render 'tasks/index'
redirect_to tasks_path
end

rescue => e
flash[:error] = e.message
render 'tasks/index'
redirect_to tasks_path
end

# GET /tasks/score/:id
Expand Down

0 comments on commit d455f35

Please sign in to comment.