Merge branch 'master' of github.com:gitlabhq/gitlabhq

bcfcd243 · Dmitriy Zaporozhets · 4f0bfdb5 · 2f962a40 · bcfcd243 · bcfcd243
Commit bcfcd243 authored Jun 30, 2014 by Dmitriy Zaporozhets
18 changed files
--- a/app/assets/javascripts/extensions/array.js
+++ b/app/assets/javascripts/extensions/array.js
--- a/app/assets/javascripts/groups.js.coffee
+++ b/app/assets/javascripts/groups.js.coffee
--- a/app/assets/javascripts/markdown_area.js.coffee
+++ b/app/assets/javascripts/markdown_area.js.coffee
--- a/app/assets/javascripts/profile.js.coffee
+++ b/app/assets/javascripts/profile.js.coffee
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
--- a/app/views/layouts/projects.html.haml
+++ b/app/views/layouts/projects.html.haml
--- a/app/views/projects/repositories/_download_archive.html.haml
+++ b/app/views/projects/repositories/_download_archive.html.haml
--- a/app/views/users/_groups.html.haml
+++ b/app/views/users/_groups.html.haml
--- a/db/migrate/20140407135544_fix_namespaces.rb
+++ b/db/migrate/20140407135544_fix_namespaces.rb
--- a/features/project/commits/user_lookup.feature
+++ b/features/project/commits/user_lookup.feature
--- a/features/project/edit_issuetracker.feature
+++ b/features/project/edit_issuetracker.feature
--- a/features/steps/project/archived.rb
+++ b/features/steps/project/archived.rb
--- a/features/steps/project/multiselect_blob.rb
+++ b/features/steps/project/multiselect_blob.rb
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
--- a/spec/fixtures/doc_sample.txt
+++ b/spec/fixtures/doc_sample.txt
--- a/spec/javascripts/stat_graph_spec.js
+++ b/spec/javascripts/stat_graph_spec.js
--- a/spec/support/valid_commit_with_alt_email.rb
+++ b/spec/support/valid_commit_with_alt_email.rb