diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
new file mode 100644
index 00000000..cbe50995
--- /dev/null
+++ b/app/views/layouts/_head.html.haml
@@ -0,0 +1,17 @@
+%head
+ %meta{:charset => "utf-8"}
+ %title
+ GitLab
+ = " - #{@project.name}" if @project && !@project.new_record?
+ = favicon_link_tag 'favicon.ico'
+ = stylesheet_link_tag "application"
+ = javascript_include_tag "application"
+
+ -# Atom feed
+ - if @project && !@project.new_record?
+ - if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
+ = auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, :ref => @ref, :private_token => current_user.private_token), :title => "Recent commits to #{@project.name}:#{@ref}")
+ - if request.path == project_issues_path(@project)
+ = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues")
+ = csrf_meta_tags
+
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 0679b405..33de3efe 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,16 +1,6 @@
-!!!
-%html
- %head
- %meta{:charset => "utf-8"}
- %title
- GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
- = favicon_link_tag 'favicon.ico'
- = stylesheet_link_tag "application"
- = javascript_include_tag "application"
- = csrf_meta_tags
- = javascript_tag do
- REQ_URI = "#{request.env["REQUEST_URI"]}";
- REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
+!!! 5
+%html{ :lang => "en"}
+ = render "layouts/head"
%body.admin
= render :partial => "layouts/flash"
= render :partial => "layouts/head_panel"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 729d0e7f..ac850809 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,13 +1,6 @@
-!!!
-%html
- %head
- %meta{:charset => "utf-8"}
- %title
- GitLab
- = favicon_link_tag 'favicon.ico'
- = stylesheet_link_tag "application"
- = javascript_include_tag "application"
- = csrf_meta_tags
+!!! 5
+%html{ :lang => "en"}
+ = render "layouts/head"
%body.application
= render :partial => "layouts/flash"
= render :partial => "layouts/head_panel"
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 8e048f81..43c35623 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -1,16 +1,6 @@
-!!!
-%html
- %head
- %meta{:charset => "utf-8"}
- %title
- GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
- = favicon_link_tag 'favicon.ico'
- = stylesheet_link_tag "application"
- = javascript_include_tag "application"
- = csrf_meta_tags
- = javascript_tag do
- REQ_URI = "#{request.env["REQUEST_URI"]}";
- REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
+!!! 5
+%html{ :lang => "en"}
+ = render "layouts/head"
%body.login-page
= render :partial => "layouts/flash"
.container-fluid= yield
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index ce41627e..046d0398 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -1,13 +1,6 @@
-!!!
-%html
- %head
- %meta{:charset => "utf-8"}
- %title
- GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
- = favicon_link_tag 'favicon.ico'
- = stylesheet_link_tag "application"
- = javascript_include_tag "application"
- = csrf_meta_tags
+!!! 5
+%html{ :lang => "en"}
+ = render "layouts/head"
%body.profile
= render :partial => "layouts/flash"
= render :partial => "layouts/head_panel"
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 97467e4c..b2c6c5d0 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -1,18 +1,6 @@
-!!!
-%html
- %head
- %meta{:charset => "utf-8"}
- %title
- GitLab
- = " - #{@project.name}" if @project && !@project.new_record?
- = favicon_link_tag 'favicon.ico'
- = stylesheet_link_tag "application"
- = javascript_include_tag "application"
- - if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
- = auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, :ref => @ref, :private_token => current_user.private_token), :title => "Recent commits to #{@project.name}:#{@ref}")
- - if request.path == project_issues_path(@project)
- = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues")
- = csrf_meta_tags
+!!! 5
+%html{ :lang => "en"}
+ = render "layouts/head"
%body.project
= render :partial => "layouts/flash"
= render :partial => "layouts/head_panel"
diff --git a/db/schema.rb b/db/schema.rb
index a6522e8e..bb9f6387 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,18 +13,6 @@
ActiveRecord::Schema.define(:version => 20120206170141) do
- create_table "features", :force => true do |t|
- t.string "name"
- t.string "branch_name"
- t.integer "assignee_id"
- t.integer "author_id"
- t.integer "project_id"
- t.datetime "created_at"
- t.datetime "updated_at"
- t.string "version"
- t.integer "status", :default => 0, :null => false
- end
-
create_table "issues", :force => true do |t|
t.string "title"
t.integer "assignee_id"