diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-05 17:59:58 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-05 17:59:58 +0300 |
| commit | 88c741dde062e320ad007a2c5ccb4e7bdc6cdacf (patch) | |
| tree | 71f4d4eafbcfde57674c74e13c75f736d248ad57 /app/controllers | |
| parent | bb5e50e0f78ec0dc68d637a43b6ea9889ef1a10d (diff) | |
| download | gitlab-ce-88c741dde062e320ad007a2c5ccb4e7bdc6cdacf.tar.gz | |
Refactor recent branches page
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/repositories_controller.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 97dbb2bc0c0..aa6914414ce 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -11,6 +11,10 @@ class Projects::BranchesController < Projects::ApplicationController @branches = Kaminari.paginate_array(@repository.branches).page(params[:page]).per(30) end + def recent + @branches = @repository.recent_branches + end + def create @repository.add_branch(params[:branch_name], params[:ref]) diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb index 7e6c7016ecf..20e2a9311ee 100644 --- a/app/controllers/projects/repositories_controller.rb +++ b/app/controllers/projects/repositories_controller.rb @@ -4,10 +4,6 @@ class Projects::RepositoriesController < Projects::ApplicationController before_filter :authorize_code_access! before_filter :require_non_empty_project - def show - @activities = @repository.commits_with_refs(20) - end - def stats @stats = Gitlab::Git::Stats.new(@repository.raw, @repository.root_ref) @graph = @stats.graph |