Merge branch 'master' into docs_refactor

3ecb3024 · Achilleas Pipinellis · 07f5a6f1 · 835f1961 · 3ecb3024 · 3ecb3024
Commit 3ecb3024 authored 9 years ago by Achilleas Pipinellis
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
--- a/lib/gitlab/github_import/project_creator.rb
+++ b/lib/gitlab/github_import/project_creator.rb
--- a/lib/gitlab/github_import/wiki_formatter.rb
+++ b/lib/gitlab/github_import/wiki_formatter.rb
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
--- a/lib/gitlab/markdown/pipeline.rb
+++ b/lib/gitlab/markdown/pipeline.rb
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
--- a/lib/gitlab/metrics/sampler.rb
+++ b/lib/gitlab/metrics/sampler.rb
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
--- a/lib/tasks/gitlab/task_helpers.rake
+++ b/lib/tasks/gitlab/task_helpers.rake
--- a/spec/controllers/admin/identities_controller_spec.rb
+++ b/spec/controllers/admin/identities_controller_spec.rb
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
--- a/spec/controllers/sent_notification_controller_spec.rb
+++ b/spec/controllers/sent_notification_controller_spec.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
--- a/spec/factories/broadcast_messages.rb
+++ b/spec/factories/broadcast_messages.rb
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
--- a/spec/factories/ci/trigger_requests.rb
+++ b/spec/factories/ci/trigger_requests.rb
--- a/spec/factories/ci/variables.rb
+++ b/spec/factories/ci/variables.rb
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb