diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-06-08 10:33:25 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-06-09 10:10:47 -0500 |
commit | b38c74d696a8592878d92f8d40c8c3e1b42678b1 (patch) | |
tree | 63fdc0193a9729899aa93296c92315a9ce6789f8 /app/controllers/projects/branches_controller.rb | |
parent | ce37a209c6394115eb77c01b877dfd3ae1a6e7e1 (diff) | |
download | gitlab-ce-b38c74d696a8592878d92f8d40c8c3e1b42678b1.tar.gz |
Revert 'New file from interface on existing branch'dm-revert-mr-8427
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
-rw-r--r-- | app/controllers/projects/branches_controller.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index d8ed470e461..70b06cfd9b4 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -10,10 +10,10 @@ class Projects::BranchesController < Projects::ApplicationController def index @sort = params[:sort].presence || sort_value_name @branches = BranchesFinder.new(@repository, params).execute + @branches = Kaminari.paginate_array(@branches).page(params[:page]) respond_to do |format| format.html do - paginate_branches @refs_pipelines = @project.pipelines.latest_successful_for_refs(@branches.map(&:name)) @max_commits = @branches.reduce(0) do |memo, branch| @@ -22,7 +22,6 @@ class Projects::BranchesController < Projects::ApplicationController end end format.json do - paginate_branches unless params[:show_all] render json: @branches.map(&:name) end end @@ -106,10 +105,6 @@ class Projects::BranchesController < Projects::ApplicationController end end - def paginate_branches - @branches = Kaminari.paginate_array(@branches).page(params[:page]) - end - def url_to_autodeploy_setup(project, branch_name) namespace_project_new_blob_path( project.namespace, |