Merge branch 'bootstrap'
Conflicts: Gemfile app/views/commits/_commits.html.haml app/views/projects/empty.html.haml
This commit is contained in:
commit
8ebfae9a07
127 changed files with 2464 additions and 2991 deletions
|
@ -106,5 +106,5 @@ Gitlab::Application.routes.draw do
|
|||
end
|
||||
resources :notes, :only => [:create, :destroy]
|
||||
end
|
||||
root :to => "dashboard#index"
|
||||
root :to => "projects#index"
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue