Merge branch '4-0-stable' into stable

02a29d1d · Dmitriy Zaporozhets · 319f0c30 · 6a932d0a · 02a29d1d · 02a29d1d
Commit 02a29d1d authored 12 years ago by Dmitriy Zaporozhets
--- a/spec/requests/api/milestones_spec.rb
+++ b/spec/requests/api/milestones_spec.rb
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
--- a/spec/requests/gitlab_flavored_markdown_spec.rb
+++ b/spec/requests/gitlab_flavored_markdown_spec.rb
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
--- a/spec/requests/projects_spec.rb
+++ b/spec/requests/projects_spec.rb
--- a/spec/requests/security/profile_access_spec.rb
+++ b/spec/requests/security/profile_access_spec.rb
--- a/spec/requests/snippets_spec.rb
+++ b/spec/requests/snippets_spec.rb
--- a/spec/roles/account_role_spec.rb
+++ b/spec/roles/account_role_spec.rb
--- a/spec/roles/repository_spec.rb
+++ b/spec/roles/repository_spec.rb
--- a/spec/routing/admin_routing_spec.rb
+++ b/spec/routing/admin_routing_spec.rb
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/api_helpers.rb
+++ b/spec/support/api_helpers.rb
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
--- a/vendor/assets/javascripts/branch-graph.js
+++ b/vendor/assets/javascripts/branch-graph.js
--- a/vendor/assets/stylesheets/jquery.ui.aristo.css
+++ b/vendor/assets/stylesheets/jquery.ui.aristo.css