[DRE-commits] [gitlab] 01/03: Merge tag 'upstream/8.3.0+dfsg' into master-8.3.0
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Dec 22 21:08:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master-8.3.0
in repository gitlab.
commit ddef8051c37cd73a213c4688cc92b1287437343d
Merge: 77b2c1a d511a8f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Wed Dec 23 02:05:10 2015 +0530
Merge tag 'upstream/8.3.0+dfsg' into master-8.3.0
Upstream version 8.3.0+dfsg
# gpg: Signature made Wednesday 23 December 2015 02:04:55 AM IST using RSA key ID 4512C22A
# gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
# gpg: aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
# gpg: aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
# gpg: aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
# gpg: aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
.gitlab-ci.yml | 42 ++-
.rubocop.yml | 83 +++--
.ruby-version | 2 +-
CHANGELOG | 88 ++++-
CONTRIBUTING.md | 374 ++++++++++++++++-----
GITLAB_SHELL_VERSION | 2 +-
GITLAB_WORKHORSE_VERSION | 2 +-
Gemfile | 53 +--
Gemfile.lock | 365 +++++++++++---------
PROCESS.md | 26 +-
Procfile | 6 +-
README.md | 6 +-
VERSION | 2 +-
app/assets/images/icon-link.png | Bin 726 -> 1128 bytes
app/assets/javascripts/api.js.coffee | 31 ++
app/assets/javascripts/application.js.coffee | 26 +-
app/assets/javascripts/awards_handler.coffee | 14 +-
app/assets/javascripts/copy_to_clipboard.js.coffee | 57 ++--
app/assets/javascripts/dispatcher.js.coffee | 2 +-
app/assets/javascripts/dropzone_input.js.coffee | 80 +----
app/assets/javascripts/flash.js.coffee | 16 +-
app/assets/javascripts/issuable_context.js.coffee | 10 +-
app/assets/javascripts/issue.js.coffee | 8 +-
app/assets/javascripts/issues.js.coffee | 2 +-
app/assets/javascripts/markdown_preview.js.coffee | 87 +++++
app/assets/javascripts/merge_request.js.coffee | 8 +-
.../javascripts/merge_request_tabs.js.coffee | 29 +-
.../javascripts/merge_request_widget.js.coffee | 9 +-
app/assets/javascripts/new_commit_form.js.coffee | 6 +-
app/assets/javascripts/notes.js.coffee | 47 ++-
app/assets/javascripts/project.js.coffee | 27 +-
app/assets/javascripts/project_select.js.coffee | 39 +++
app/assets/javascripts/sidebar.js.coffee | 1 +
app/assets/javascripts/user.js.coffee | 6 +
app/assets/javascripts/users_select.js.coffee | 28 +-
app/assets/stylesheets/framework.scss | 3 +-
app/assets/stylesheets/framework/blocks.scss | 13 +
app/assets/stylesheets/framework/callout.scss | 5 +-
app/assets/stylesheets/framework/common.scss | 57 +++-
app/assets/stylesheets/framework/files.scss | 5 +-
app/assets/stylesheets/framework/forms.scss | 21 +-
app/assets/stylesheets/framework/header.scss | 8 +-
app/assets/stylesheets/framework/issue_box.scss | 15 +-
app/assets/stylesheets/framework/layout.scss | 11 +-
app/assets/stylesheets/framework/lists.scss | 52 ++-
.../stylesheets/framework/markdown_area.scss | 9 +-
app/assets/stylesheets/framework/mobile.scss | 3 -
app/assets/stylesheets/framework/pagination.scss | 4 +
app/assets/stylesheets/framework/panels.scss | 20 ++
app/assets/stylesheets/framework/selects.scss | 62 +++-
app/assets/stylesheets/framework/sidebar.scss | 191 ++++++-----
app/assets/stylesheets/framework/tables.scss | 2 +
app/assets/stylesheets/framework/timeline.scss | 3 +-
app/assets/stylesheets/framework/typography.scss | 11 +
app/assets/stylesheets/framework/variables.scss | 2 +-
app/assets/stylesheets/pages/awards.scss | 86 +++++
app/assets/stylesheets/pages/builds.scss | 9 +-
app/assets/stylesheets/pages/commit.scss | 19 +-
app/assets/stylesheets/pages/detail_page.scss | 33 ++
app/assets/stylesheets/pages/editor.scss | 46 +--
app/assets/stylesheets/pages/groups.scss | 7 +-
app/assets/stylesheets/pages/issuable.scss | 144 +++-----
app/assets/stylesheets/pages/issues.scss | 36 +-
app/assets/stylesheets/pages/login.scss | 1 +
app/assets/stylesheets/pages/merge_requests.scss | 52 +--
app/assets/stylesheets/pages/note_form.scss | 10 +-
app/assets/stylesheets/pages/notes.scss | 10 +-
app/assets/stylesheets/pages/profile.scss | 6 -
app/assets/stylesheets/pages/projects.scss | 27 +-
app/assets/stylesheets/pages/snippets.scss | 50 +--
app/assets/stylesheets/pages/status.scss | 17 +
app/assets/stylesheets/pages/ui_dev_kit.scss | 5 +-
app/assets/stylesheets/pages/wiki.scss | 5 +
app/controllers/abuse_reports_controller.rb | 2 +-
.../admin/application_settings_controller.rb | 6 +
app/controllers/admin/builds_controller.rb | 23 ++
app/controllers/admin/identities_controller.rb | 17 +-
app/controllers/admin/impersonation_controller.rb | 16 +-
.../admin/runner_projects_controller.rb | 35 ++
app/controllers/admin/runners_controller.rb | 63 ++++
app/controllers/autocomplete_controller.rb | 51 ++-
app/controllers/ci/admin/application_controller.rb | 10 -
.../ci/admin/application_settings_controller.rb | 31 --
app/controllers/ci/admin/builds_controller.rb | 18 -
app/controllers/ci/admin/events_controller.rb | 9 -
app/controllers/ci/admin/projects_controller.rb | 19 --
.../ci/admin/runner_projects_controller.rb | 34 --
app/controllers/ci/admin/runners_controller.rb | 73 ----
app/controllers/ci/application_controller.rb | 18 +-
app/controllers/ci/lints_controller.rb | 2 +-
app/controllers/ci/projects_controller.rb | 11 +-
app/controllers/ci/runner_projects_controller.rb | 34 --
app/controllers/concerns/global_milestones.rb | 2 +
app/controllers/concerns/issues_action.rb | 14 +
app/controllers/concerns/merge_requests_action.rb | 9 +
app/controllers/dashboard/snippets_controller.rb | 3 +-
app/controllers/dashboard_controller.rb | 20 +-
app/controllers/groups/milestones_controller.rb | 2 +-
app/controllers/groups_controller.rb | 20 +-
app/controllers/passwords_controller.rb | 6 +-
app/controllers/profiles_controller.rb | 1 +
app/controllers/projects/application_controller.rb | 8 +-
app/controllers/projects/blob_controller.rb | 12 +-
app/controllers/projects/branches_controller.rb | 2 +-
app/controllers/projects/builds_controller.rb | 11 +-
app/controllers/projects/ci_services_controller.rb | 49 ---
app/controllers/projects/ci_settings_controller.rb | 36 --
.../projects/ci_web_hooks_controller.rb | 45 ---
app/controllers/projects/commit_controller.rb | 16 +-
app/controllers/projects/graphs_controller.rb | 32 +-
app/controllers/projects/hooks_controller.rb | 8 +-
app/controllers/projects/issues_controller.rb | 6 +-
.../projects/merge_requests_controller.rb | 86 +++--
app/controllers/projects/notes_controller.rb | 34 +-
.../projects/project_members_controller.rb | 2 +-
.../projects/protected_branches_controller.rb | 2 +-
app/controllers/projects/raw_controller.rb | 41 ++-
.../projects/runner_projects_controller.rb | 26 ++
app/controllers/projects/runners_controller.rb | 15 +-
app/controllers/projects/services_controller.rb | 9 +-
app/controllers/projects/tags_controller.rb | 2 +-
app/controllers/projects/triggers_controller.rb | 9 +-
app/controllers/projects/variables_controller.rb | 5 +-
app/controllers/projects_controller.rb | 6 +-
app/controllers/snippets_controller.rb | 2 +-
app/finders/issuable_finder.rb | 20 +-
app/finders/milestones_finder.rb | 2 +-
app/finders/projects_finder.rb | 10 +-
app/helpers/application_helper.rb | 18 +-
app/helpers/blob_helper.rb | 52 +--
app/helpers/branches_helper.rb | 2 +-
app/helpers/button_helper.rb | 58 ++++
app/helpers/ci/gitlab_helper.rb | 17 -
app/helpers/ci/projects_helper.rb | 36 --
app/helpers/ci_badge_helper.rb | 13 +
app/helpers/ci_status_helper.rb | 43 +--
app/helpers/clipboard_helper.rb | 8 -
app/helpers/commits_helper.rb | 4 +-
app/helpers/diff_helper.rb | 36 +-
app/helpers/emails_helper.rb | 2 +
app/helpers/external_wiki_helper.rb | 2 +-
app/helpers/gitlab_markdown_helper.rb | 53 ++-
app/helpers/gitlab_routing_helper.rb | 2 +-
app/helpers/graph_helper.rb | 10 +
app/helpers/icons_helper.rb | 22 +-
app/helpers/issues_helper.rb | 33 +-
app/helpers/labels_helper.rb | 2 +-
app/helpers/merge_requests_helper.rb | 28 +-
app/helpers/milestones_helper.rb | 2 +
app/helpers/namespaces_helper.rb | 15 +-
app/helpers/nav_helper.rb | 8 +
app/helpers/page_layout_helper.rb | 3 +-
app/helpers/projects_helper.rb | 27 +-
app/helpers/runners_helper.rb | 2 +-
app/helpers/selects_helper.rb | 43 ++-
app/helpers/tree_helper.rb | 20 +-
app/helpers/triggers_helper.rb | 4 +-
app/helpers/visibility_level_helper.rb | 64 ++--
app/mailers/base_mailer.rb | 4 -
app/mailers/ci/emails/builds.rb | 17 -
app/mailers/ci/notify.rb | 46 ---
app/mailers/emails/builds.rb | 15 +
app/mailers/emails/issues.rb | 68 ++--
app/mailers/emails/notes.rb | 75 +++--
app/mailers/emails/projects.rb | 88 +----
app/mailers/notify.rb | 7 +-
app/models/ability.rb | 12 +-
app/models/application_setting.rb | 33 +-
app/models/broadcast_message.rb | 8 +-
app/models/ci/application_setting.rb | 33 --
app/models/ci/build.rb | 67 ++--
app/models/ci/commit.rb | 36 +-
app/models/ci/event.rb | 27 --
app/models/ci/project.rb | 192 -----------
app/models/ci/project_status.rb | 31 --
app/models/ci/runner.rb | 6 +-
app/models/ci/runner_project.rb | 4 +-
app/models/ci/service.rb | 105 ------
app/models/ci/trigger.rb | 2 +-
app/models/ci/variable.rb | 4 +-
app/models/ci/web_hook.rb | 44 ---
app/models/commit.rb | 50 ++-
app/models/commit_range.rb | 110 ++++--
app/models/commit_status.rb | 62 ++--
app/models/concerns/issuable.rb | 13 +-
app/models/concerns/mentionable.rb | 53 +--
app/models/concerns/participable.rb | 31 +-
app/models/concerns/referable.rb | 23 ++
app/models/concerns/strip_attribute.rb | 34 ++
app/models/concerns/taskable.rb | 33 +-
app/models/concerns/token_authenticatable.rb | 44 ++-
app/models/event.rb | 2 +-
app/models/global_milestone.rb | 31 +-
app/models/hooks/project_hook.rb | 1 +
app/models/hooks/web_hook.rb | 40 +--
app/models/issue.rb | 12 +
app/models/jira_issue.rb | 2 +
app/models/label.rb | 6 +-
app/models/lfs_object.rb | 24 ++
app/models/lfs_objects_project.rb | 11 +
app/models/merge_request.rb | 88 +++--
app/models/milestone.rb | 9 +-
app/models/namespace.rb | 18 +-
app/models/note.rb | 38 ++-
app/models/project.rb | 106 ++++--
app/models/project_services/bamboo_service.rb | 13 +-
app/models/project_services/buildkite_service.rb | 2 +-
.../project_services/builds_email_service.rb | 90 +++++
app/models/project_services/ci/hip_chat_message.rb | 73 ----
app/models/project_services/ci/hip_chat_service.rb | 93 -----
app/models/project_services/ci/mail_service.rb | 84 -----
app/models/project_services/ci/slack_message.rb | 92 -----
app/models/project_services/ci/slack_service.rb | 81 -----
app/models/project_services/drone_ci_service.rb | 31 +-
.../project_services/external_wiki_service.rb | 6 +-
app/models/project_services/flowdock_service.rb | 2 +-
app/models/project_services/gemnasium_service.rb | 2 +-
app/models/project_services/gitlab_ci_service.rb | 76 +----
app/models/project_services/hipchat_service.rb | 49 ++-
app/models/project_services/jira_service.rb | 241 ++++++++++++-
app/models/project_services/slack_service.rb | 29 +-
.../project_services/slack_service/base_message.rb | 3 +
.../slack_service/build_message.rb | 82 +++++
.../project_services/slack_service/note_message.rb | 31 +-
app/models/project_services/teamcity_service.rb | 10 +-
app/models/repository.rb | 85 +++--
app/models/sent_notification.rb | 7 +-
app/models/service.rb | 21 +-
app/models/snippet.rb | 4 +
app/models/user.rb | 36 +-
app/models/users_star_project.rb | 2 +-
app/services/ci/create_builds_service.rb | 6 +-
app/services/ci/create_commit_service.rb | 28 --
app/services/ci/create_trigger_request_service.rb | 6 +-
app/services/ci/event_service.rb | 31 --
app/services/ci/image_for_build_service.rb | 4 +-
app/services/ci/register_build_service.rb | 9 +-
app/services/ci/test_hook_service.rb | 7 -
app/services/create_branch_service.rb | 5 +-
app/services/create_commit_builds_service.rb | 42 +++
app/services/delete_branch_service.rb | 4 +-
app/services/files/base_service.rb | 4 +-
app/services/git_hooks_service.rb | 28 ++
app/services/git_push_service.rb | 1 +
app/services/git_tag_push_service.rb | 1 +
app/services/gravatar_service.rb | 4 +-
app/services/issuable_base_service.rb | 49 +++
app/services/issues/close_service.rb | 5 +
app/services/issues/update_service.rb | 38 +--
app/services/merge_requests/merge_service.rb | 18 +-
.../merge_when_build_succeeds_service.rb | 55 +++
app/services/merge_requests/refresh_service.rb | 8 +-
app/services/merge_requests/update_service.rb | 43 +--
app/services/notes/create_service.rb | 13 -
app/services/notification_service.rb | 122 ++++---
app/services/projects/create_service.rb | 6 +-
app/services/projects/fork_service.rb | 15 +-
app/services/system_note_service.rb | 43 ++-
app/validators/color_validator.rb | 20 ++
app/validators/email_validator.rb | 18 +
app/validators/line_code_validator.rb | 12 +
app/validators/namespace_name_validator.rb | 10 +
app/validators/namespace_validator.rb | 50 +++
app/validators/url_validator.rb | 36 ++
.../admin/application_settings/_form.html.haml | 4 +-
app/views/admin/builds/_build.html.haml | 73 ++++
app/views/admin/builds/index.html.haml | 50 +++
app/views/admin/identities/index.html.haml | 1 +
app/views/admin/identities/new.html.haml | 4 +
app/views/admin/labels/_form.html.haml | 2 +-
app/views/admin/labels/_label.html.haml | 2 +-
app/views/admin/labels/edit.html.haml | 8 +-
app/views/admin/labels/new.html.haml | 6 +-
app/views/admin/runners/_runner.html.haml | 48 +++
app/views/admin/runners/index.html.haml | 67 ++++
app/views/admin/runners/show.html.haml | 125 +++++++
app/views/{ci => }/admin/runners/update.js.haml | 0
app/views/admin/users/_head.html.haml | 2 +-
app/views/admin/users/_projects.html.haml | 13 +
app/views/admin/users/edit.html.haml | 3 -
app/views/admin/users/projects.html.haml | 2 +-
.../ci/admin/application_settings/_form.html.haml | 24 --
.../ci/admin/application_settings/show.html.haml | 3 -
app/views/ci/admin/builds/_build.html.haml | 34 --
app/views/ci/admin/builds/index.html.haml | 28 --
app/views/ci/admin/events/index.html.haml | 18 -
app/views/ci/admin/projects/_project.html.haml | 29 --
app/views/ci/admin/projects/index.html.haml | 16 -
app/views/ci/admin/runner_projects/index.html.haml | 57 ----
app/views/ci/admin/runners/_runner.html.haml | 48 ---
app/views/ci/admin/runners/index.html.haml | 53 ---
app/views/ci/admin/runners/show.html.haml | 130 -------
app/views/ci/commits/_commit.html.haml | 5 +-
app/views/ci/notify/build_fail_email.html.haml | 23 --
app/views/ci/notify/build_fail_email.text.erb | 11 -
app/views/ci/notify/build_success_email.html.haml | 24 --
app/views/ci/notify/build_success_email.text.erb | 11 -
app/views/ci/shared/_guide.html.haml | 8 +-
app/views/ci/user_sessions/new.html.haml | 7 -
app/views/dashboard/_projects_head.html.haml | 5 +-
app/views/dashboard/groups/index.html.haml | 4 +-
app/views/dashboard/issues.html.haml | 20 +-
app/views/dashboard/merge_requests.html.haml | 12 +-
.../dashboard/milestones/_milestone.html.haml | 11 +-
app/views/dashboard/milestones/index.html.haml | 10 +-
app/views/dashboard/milestones/show.html.haml | 44 ++-
app/views/dashboard/projects/index.html.haml | 2 +-
app/views/dashboard/projects/starred.html.haml | 2 +-
.../devise/mailer/unlock_instructions.html.erb | 7 -
.../devise/mailer/unlock_instructions.html.haml | 10 +
app/views/devise/unlocks/new.html.erb | 12 -
app/views/devise/unlocks/new.html.haml | 14 +
app/views/events/_commit.html.haml | 2 +-
app/views/explore/projects/_filter.html.haml | 2 +-
app/views/explore/projects/index.html.haml | 2 +-
app/views/explore/projects/starred.html.haml | 2 +-
app/views/explore/projects/trending.html.haml | 2 +-
app/views/groups/edit.html.haml | 6 +-
.../groups/group_members/_group_member.html.haml | 6 +-
app/views/groups/group_members/index.html.haml | 57 ++--
app/views/groups/group_members/update.js.haml | 2 +-
app/views/groups/issues.html.haml | 27 +-
app/views/groups/merge_requests.html.haml | 19 +-
app/views/groups/milestones/index.html.haml | 24 +-
app/views/groups/milestones/new.html.haml | 3 +-
app/views/groups/milestones/show.html.haml | 47 ++-
app/views/groups/new.html.haml | 8 +-
app/views/help/ui.html.haml | 48 ++-
app/views/import/bitbucket/status.html.haml | 1 +
app/views/import/fogbugz/new.html.haml | 1 +
app/views/import/fogbugz/new_user_map.html.haml | 1 +
app/views/import/fogbugz/status.html.haml | 1 +
app/views/import/github/status.html.haml | 1 +
app/views/import/gitlab/status.html.haml | 1 +
app/views/import/gitorious/status.html.haml | 1 +
app/views/import/google_code/new.html.haml | 3 +-
.../import/google_code/new_user_map.html.haml | 17 +-
app/views/import/google_code/status.html.haml | 1 +
app/views/layouts/_page.html.haml | 10 +-
app/views/layouts/admin.html.haml | 4 +-
app/views/layouts/ci/_nav_admin.html.haml | 35 --
app/views/layouts/ci/_nav_project.html.haml | 12 -
app/views/layouts/ci/_page.html.haml | 10 +-
app/views/layouts/ci/admin.html.haml | 11 -
app/views/layouts/ci/application.html.haml | 11 -
app/views/layouts/devise.html.haml | 4 +-
app/views/layouts/errors.html.haml | 2 +-
app/views/layouts/header/_default.html.haml | 12 +-
app/views/layouts/nav/_admin.html.haml | 41 ++-
app/views/layouts/nav/_dashboard.html.haml | 18 +-
app/views/layouts/nav/_explore.html.haml | 8 +-
app/views/layouts/nav/_group.html.haml | 14 +-
app/views/layouts/nav/_group_settings.html.haml | 6 +-
app/views/layouts/nav/_profile.html.haml | 20 +-
app/views/layouts/nav/_project.html.haml | 50 +--
app/views/layouts/nav/_project_settings.html.haml | 33 +-
app/views/notify/build_fail_email.html.haml | 23 ++
app/views/notify/build_fail_email.text.erb | 11 +
app/views/notify/build_success_email.html.haml | 24 ++
app/views/notify/build_success_email.text.erb | 11 +
app/views/notify/repository_push_email.html.haml | 28 +-
app/views/notify/repository_push_email.text.haml | 24 +-
app/views/profiles/accounts/show.html.haml | 24 +-
app/views/profiles/applications.html.haml | 84 ++---
app/views/profiles/keys/_form.html.haml | 7 +-
app/views/profiles/keys/_key_table.html.haml | 16 +-
app/views/profiles/keys/index.html.haml | 4 +-
app/views/profiles/keys/new.html.haml | 2 +-
app/views/profiles/notifications/show.html.haml | 6 +-
app/views/profiles/preferences/show.html.haml | 2 +-
app/views/profiles/show.html.haml | 10 +-
app/views/projects/_commit_button.html.haml | 4 +-
app/views/projects/_home_panel.html.haml | 17 +-
app/views/projects/_last_commit.html.haml | 2 +-
app/views/projects/_md_preview.html.haml | 19 +-
app/views/projects/_readme.html.haml | 25 +-
app/views/projects/blame/show.html.haml | 3 +-
app/views/projects/blob/_actions.html.haml | 16 +-
app/views/projects/blob/_blob.html.haml | 6 +-
app/views/projects/blob/_download.html.haml | 2 +-
app/views/projects/blob/_editor.html.haml | 25 +-
app/views/projects/blob/_new_dir.html.haml | 14 +-
app/views/projects/blob/_upload.html.haml | 7 +-
app/views/projects/blob/edit.html.haml | 6 +-
app/views/projects/blob/new.html.haml | 5 +-
app/views/projects/blob/show.html.haml | 2 +-
app/views/projects/branches/_branch.html.haml | 22 +-
app/views/projects/branches/_commit.html.haml | 2 +-
app/views/projects/branches/index.html.haml | 2 +-
app/views/projects/branches/new.html.haml | 16 +-
app/views/projects/builds/index.html.haml | 16 +-
app/views/projects/builds/show.html.haml | 20 +-
app/views/projects/ci_services/_form.html.haml | 54 ---
app/views/projects/ci_services/edit.html.haml | 2 -
app/views/projects/ci_services/index.html.haml | 23 --
app/views/projects/ci_settings/_form.html.haml | 120 -------
.../projects/ci_settings/_no_runners.html.haml | 8 -
app/views/projects/ci_settings/edit.html.haml | 6 -
app/views/projects/ci_web_hooks/index.html.haml | 94 ------
app/views/projects/commit/_builds.html.haml | 68 ++++
app/views/projects/commit/_ci_menu.html.haml | 4 +-
app/views/projects/commit/_commit_box.html.haml | 12 +-
app/views/projects/commit/builds.html.haml | 68 +---
app/views/projects/commit/show.html.haml | 5 +-
.../commit_statuses/_commit_status.html.haml | 21 +-
app/views/projects/commits/_commit.html.haml | 8 +-
app/views/projects/commits/_head.html.haml | 5 +
app/views/projects/commits/show.atom.builder | 2 +-
app/views/projects/compare/show.html.haml | 4 +-
app/views/projects/deploy_keys/_form.html.haml | 9 +-
app/views/projects/deploy_keys/new.html.haml | 2 +-
app/views/projects/diffs/_diffs.html.haml | 2 +-
app/views/projects/diffs/_file.html.haml | 25 +-
app/views/projects/edit.html.haml | 96 +++++-
app/views/projects/empty.html.haml | 15 +-
app/views/projects/graphs/_head.html.haml | 2 +
app/views/projects/graphs/ci/_overall.haml | 11 +-
app/views/projects/graphs/languages.html.haml | 32 ++
app/views/projects/hooks/index.html.haml | 9 +-
app/views/projects/issues/_closed_by_box.html.haml | 5 +-
app/views/projects/issues/_discussion.html.haml | 33 +-
app/views/projects/issues/_form.html.haml | 8 +-
app/views/projects/issues/_issue.html.haml | 41 ++-
.../projects/issues/_merge_requests.html.haml | 26 ++
app/views/projects/issues/edit.html.haml | 6 +
app/views/projects/issues/new.html.haml | 4 +
app/views/projects/issues/show.html.haml | 95 +++---
app/views/projects/issues/update.js.haml | 4 +-
app/views/projects/labels/_form.html.haml | 10 +-
app/views/projects/labels/_label.html.haml | 2 +-
app/views/projects/labels/edit.html.haml | 8 +-
app/views/projects/labels/index.html.haml | 1 +
app/views/projects/labels/new.html.haml | 6 +-
.../projects/merge_requests/_discussion.html.haml | 29 +-
app/views/projects/merge_requests/_form.html.haml | 3 +-
.../merge_requests/_merge_request.html.haml | 71 ++--
.../projects/merge_requests/_new_compare.html.haml | 14 +-
.../projects/merge_requests/_new_submit.html.haml | 30 +-
app/views/projects/merge_requests/_show.html.haml | 77 +++--
.../cancel_merge_when_build_succeeds.js.haml | 2 +
app/views/projects/merge_requests/edit.html.haml | 2 +-
app/views/projects/merge_requests/merge.js.haml | 8 +-
app/views/projects/merge_requests/new.html.haml | 2 +-
.../projects/merge_requests/show/_builds.html.haml | 1 +
.../merge_requests/show/_commits.html.haml | 2 +-
.../merge_requests/show/_how_to_merge.html.haml | 12 +-
.../projects/merge_requests/show/_mr_box.html.haml | 8 +-
.../merge_requests/show/_mr_title.html.haml | 15 +-
.../merge_requests/show/_participants.html.haml | 4 -
app/views/projects/merge_requests/update.js.haml | 4 +-
.../merge_requests/widget/_heading.html.haml | 39 ++-
.../merge_requests/widget/_merged.html.haml | 18 +-
.../projects/merge_requests/widget/_open.html.haml | 4 +-
.../merge_requests/widget/open/_accept.html.haml | 68 +++-
.../open/_merge_when_build_succeeds.html.haml | 26 ++
app/views/projects/milestones/_form.html.haml | 10 +-
app/views/projects/milestones/_milestone.html.haml | 8 +-
app/views/projects/milestones/edit.html.haml | 6 +
app/views/projects/milestones/index.html.haml | 15 +-
app/views/projects/milestones/new.html.haml | 6 +
app/views/projects/milestones/show.html.haml | 87 +++--
app/views/projects/network/_head.html.haml | 9 +-
app/views/projects/network/show.html.haml | 3 +-
app/views/projects/new.html.haml | 43 +--
app/views/projects/notes/_edit_form.html.haml | 5 +-
app/views/projects/notes/_form.html.haml | 9 +-
app/views/projects/notes/_note.html.haml | 2 +-
.../projects/notes/_notes_with_form.html.haml | 2 +-
.../project_members/_group_members.html.haml | 13 +-
.../project_members/_project_member.html.haml | 4 +-
app/views/projects/project_members/_team.html.haml | 16 +-
app/views/projects/project_members/index.html.haml | 45 +--
.../projects/protected_branches/index.html.haml | 5 +-
app/views/projects/releases/edit.html.haml | 2 +-
.../repositories/_download_archive.html.haml | 4 +-
app/views/projects/repositories/_feed.html.haml | 2 +-
app/views/projects/runners/_runner.html.haml | 6 +-
.../projects/runners/_shared_runners.html.haml | 10 +-
.../projects/runners/_specific_runners.html.haml | 2 +-
app/views/projects/runners/edit.html.haml | 4 +-
app/views/projects/services/_form.html.haml | 7 +-
app/views/projects/show.html.haml | 2 +-
app/views/projects/snippets/edit.html.haml | 2 +-
app/views/projects/snippets/new.html.haml | 2 +-
app/views/projects/snippets/show.html.haml | 4 +-
app/views/projects/tags/_tag.html.haml | 12 +-
app/views/projects/tags/index.html.haml | 2 +-
app/views/projects/tags/new.html.haml | 23 +-
app/views/projects/tags/show.html.haml | 8 +-
app/views/projects/tree/_tree_content.html.haml | 2 +-
app/views/projects/tree/_tree_header.html.haml | 18 +-
app/views/projects/triggers/index.html.haml | 8 +-
app/views/projects/variables/show.html.haml | 6 +-
app/views/projects/wikis/_form.html.haml | 16 +-
app/views/projects/wikis/_main_links.html.haml | 11 +-
app/views/projects/wikis/_nav.html.haml | 25 +-
app/views/projects/wikis/_new.html.haml | 4 +-
app/views/projects/wikis/edit.html.haml | 24 +-
app/views/projects/wikis/git_access.html.haml | 2 +-
app/views/projects/wikis/pages.html.haml | 7 +-
app/views/projects/wikis/show.html.haml | 12 +-
app/views/shared/_clone_panel.html.haml | 24 +-
app/views/shared/_confirm_modal.html.haml | 7 +-
app/views/shared/_file_highlight.html.haml | 5 +-
app/views/shared/_group_form.html.haml | 2 +-
app/views/shared/_issues.html.haml | 7 +-
app/views/shared/_merge_requests.html.haml | 7 +-
app/views/shared/_milestone_expired.html.haml | 5 +
app/views/shared/_new_commit_form.html.haml | 18 +-
.../shared/_new_project_item_select.html.haml | 20 ++
app/views/shared/_project_limit.html.haml | 8 +
app/views/shared/_service_settings.html.haml | 9 +
app/views/shared/issuable/_context.html.haml | 50 ---
app/views/shared/issuable/_filter.html.haml | 16 +-
app/views/shared/issuable/_form.html.haml | 54 ++-
app/views/shared/issuable/_participants.html.haml | 5 +
app/views/shared/issuable/_sidebar.html.haml | 83 +++++
app/views/shared/snippets/_form.html.haml | 7 +-
app/views/shared/snippets/_header.html.haml | 47 +--
app/views/sherlock/transactions/_general.html.haml | 6 +
app/views/snippets/edit.html.haml | 2 +-
app/views/snippets/new.html.haml | 2 +-
app/views/snippets/show.html.haml | 4 +-
app/views/users/show.html.haml | 2 +-
app/views/votes/_votes_block.html.haml | 3 +-
app/workers/build_email_worker.rb | 19 ++
app/workers/ci/hip_chat_notifier_worker.rb | 19 --
app/workers/ci/slack_notifier_worker.rb | 10 -
app/workers/ci/web_hook_worker.rb | 9 -
app/workers/email_receiver_worker.rb | 2 +-
app/workers/emails_on_push_worker.rb | 2 +-
app/workers/merge_worker.rb | 13 +-
app/workers/stuck_ci_builds_worker.rb | 3 -
bin/background_jobs | 2 +-
bin/ci/upgrade.rb | 0
bin/parallel-rsync-repos | 54 +++
bin/rails | 6 +-
bin/rake | 9 +-
bin/setup | 29 ++
bin/upgrade.rb | 0
config/application.rb | 4 +
config/environment.rb | 2 +-
config/environments/development.rb | 2 +-
config/environments/production.rb | 6 +-
config/environments/test.rb | 8 +-
config/gitlab.yml.example | 2 +-
config/initializers/1_settings.rb | 19 +-
config/initializers/4_ci_app.rb | 2 -
config/initializers/carrierwave.rb | 10 +-
config/initializers/cookies_serializer.rb | 2 +-
config/initializers/default_url_options.rb | 2 +-
config/initializers/devise.rb | 6 +-
config/initializers/omniauth.rb | 2 +-
config/initializers/rack_attack.rb.example | 14 +-
config/initializers/rack_lineprof.rb | 2 +-
config/initializers/secret_token.rb | 8 +-
config/initializers/session_store.rb | 8 +-
config/initializers/sherlock.rb | 2 +-
config/initializers/sidekiq.rb | 14 +
config/initializers/smtp_settings.rb.sample | 2 +-
config/initializers/static_files.rb | 4 +-
config/locales/devise.en.yml | 1 -
config/locales/sherlock.en.yml | 1 +
config/routes.rb | 83 ++---
config/schedule.yml | 10 +
db/migrate/20121220064453_init_schema.rb | 74 ++--
.../20140122112253_create_merge_request_diffs.rb | 15 +-
db/migrate/20140903115954_migrate_to_new_shell.rb | 2 +
.../20151012173029_set_jira_service_api_url.rb | 50 +++
...d_merge_when_build_succeeds_to_merge_request.rb | 7 +
.../20151109134526_add_issues_state_index.rb | 5 +
...09134916_add_projects_visibility_level_index.rb | 5 +
...151203162133_add_hide_project_limit_to_users.rb | 5 +
.../20151203162134_add_build_events_to_services.rb | 6 +
db/migrate/20151209144329_migrate_ci_web_hooks.rb | 13 +
db/migrate/20151209145909_migrate_ci_emails.rb | 45 +++
.../20151210030143_add_unlock_token_to_user.rb | 5 +
...s_registration_token_to_application_settings.rb | 5 +
.../20151210125232_migrate_ci_slack_service.rb | 33 ++
.../20151210125927_migrate_ci_hip_chat_service.rb | 34 ++
db/migrate/20151210125928_add_ci_to_project.rb | 11 +
db/migrate/20151210125929_add_project_id_to_ci.rb | 8 +
db/migrate/20151210125930_migrate_ci_to_project.rb | 38 +++
.../20151210125931_add_index_to_ci_tables.rb | 12 +
.../20151210125932_drop_null_for_ci_tables.rb | 9 +
db/schema.rb | 165 +++++----
doc/README.md | 13 +
doc/api/groups.md | 70 +++-
doc/api/merge_requests.md | 93 ++++-
doc/api/notes.md | 15 +-
doc/api/projects.md | 93 ++++-
doc/api/settings.md | 2 +-
doc/ci/README.md | 12 +
doc/ci/docker/using_docker_images.md | 302 ++++++++++-------
doc/ci/img/builds_tab.png | Bin 0 -> 3845 bytes
doc/ci/languages/README.md | 7 +
doc/ci/languages/php.md | 284 ++++++++++++++++
doc/ci/quick_start/README.md | 204 +++++++----
doc/ci/quick_start/build_status.png | Bin 62140 -> 0 bytes
doc/ci/quick_start/commit_status.png | Bin 33492 -> 0 bytes
doc/ci/quick_start/img/build_log.png | Bin 0 -> 63272 bytes
doc/ci/quick_start/img/builds_status.png | Bin 0 -> 49121 bytes
doc/ci/quick_start/img/new_commit.png | Bin 0 -> 9033 bytes
doc/ci/quick_start/img/runners_activated.png | Bin 0 -> 27597 bytes
.../img/single_commit_status_pending.png | Bin 0 -> 36431 bytes
doc/ci/quick_start/img/status_pending.png | Bin 0 -> 19782 bytes
doc/ci/quick_start/new_commit.png | Bin 47527 -> 0 bytes
doc/ci/quick_start/projects.png | Bin 37014 -> 0 bytes
doc/ci/quick_start/runners.png | Bin 123048 -> 0 bytes
doc/ci/quick_start/runners_activated.png | Bin 60769 -> 0 bytes
doc/ci/services/README.md | 9 +
doc/ci/services/docker-services.md | 5 +
doc/ci/services/mysql.md | 118 +++++++
doc/ci/services/postgres.md | 114 +++++++
doc/ci/services/redis.md | 69 ++++
doc/ci/ssh_keys/README.md | 109 ++++++
doc/ci/variables/README.md | 2 -
doc/ci/yaml/README.md | 283 ++++++++++------
doc/customization/issue_closing.md | 27 +-
doc/development/db_dump.md | 2 +-
doc/install/installation.md | 75 +++--
doc/integration/README.md | 1 +
doc/integration/bitbucket.md | 2 +-
doc/integration/crowd.md | 2 +-
doc/integration/github.md | 2 +-
doc/integration/gitlab.md | 2 +-
doc/integration/google.md | 2 +-
doc/integration/jira.md | 113 +++++++
doc/integration/jira_issue_reference.png | Bin 0 -> 39942 bytes
doc/integration/jira_project_name.png | Bin 0 -> 60598 bytes
doc/integration/jira_service.png | Bin 0 -> 59082 bytes
doc/integration/jira_service_close_issue.png | Bin 0 -> 88433 bytes
doc/integration/jira_service_page.png | Bin 0 -> 162449 bytes
doc/integration/jira_workflow_screenshot.png | Bin 0 -> 121534 bytes
doc/integration/ldap.md | 8 +-
doc/integration/saml.md | 7 +-
doc/integration/twitter.md | 2 +-
doc/operations/moving_repositories.md | 180 ++++++++++
doc/permissions/permissions.md | 7 +-
doc/public_access/public_access.md | 51 ++-
doc/raketasks/README.md | 3 +-
doc/raketasks/backup_restore.md | 7 +-
doc/raketasks/check.md | 63 ++++
doc/raketasks/check_repos_output.png | Bin 0 -> 73786 bytes
doc/raketasks/list_repos.md | 30 ++
doc/release/README.md | 6 +-
doc/release/monthly.md | 4 +-
doc/release/patch.md | 40 ++-
doc/security/README.md | 3 +-
doc/security/user_file_uploads.md | 11 +
doc/ssh/README.md | 5 +-
doc/update/8.1-to-8.2.md | 7 +-
doc/update/8.2-to-8.3.md | 202 +++++++++++
doc/update/patch_versions.md | 45 ++-
doc/web_hooks/web_hooks.md | 18 +-
doc/workflow/README.md | 2 +
doc/workflow/importing/README.md | 20 +-
doc/workflow/importing/migrating_from_svn.md | 79 ++++-
.../lfs/manage_large_binaries_with_git_lfs.md | 4 +-
doc/workflow/merge_when_build_succeeds.md | 15 +
doc/workflow/merge_when_build_succeeds/enable.png | Bin 0 -> 151112 bytes
doc/workflow/merge_when_build_succeeds/status.png | Bin 0 -> 180318 bytes
features/admin/groups.feature | 16 +
features/admin/projects.feature | 16 +
features/explore/projects.feature | 21 +-
features/group/members.feature | 105 ++++++
features/group/milestones.feature | 30 ++
features/groups.feature | 125 -------
features/project/active_tab.feature | 11 +-
features/project/commits/branches.feature | 1 +
features/project/commits/comments.feature | 1 +
features/project/commits/commits.feature | 4 +-
features/project/commits/diff_comments.feature | 7 +
features/project/commits/tags.feature | 1 +
features/project/commits/user_lookup.feature | 1 +
features/project/create.feature | 2 +
features/project/graph.feature | 5 +
features/project/issues/award_emoji.feature | 7 +-
features/project/issues/filter_labels.feature | 1 +
features/project/issues/issues.feature | 6 +
features/project/issues/labels.feature | 1 +
features/project/issues/milestones.feature | 1 +
features/project/merge_requests.feature | 21 ++
features/project/merge_requests/accept.feature | 20 ++
features/project/service.feature | 12 +-
features/project/shortcuts.feature | 3 +-
features/project/source/browse_files.feature | 23 +-
features/project/team_management.feature | 6 +-
features/steps/admin/groups.rb | 29 ++
features/steps/admin/labels.rb | 12 +-
features/steps/admin/projects.rb | 37 ++
features/steps/admin/settings.rb | 2 +
features/steps/dashboard/dashboard.rb | 2 +-
features/steps/explore/groups.rb | 8 +-
features/steps/explore/projects.rb | 13 +-
features/steps/group/members.rb | 147 ++++++++
features/steps/group/milestones.rb | 90 +++++
features/steps/groups.rb | 261 +-------------
features/steps/profile/profile.rb | 2 +-
features/steps/project/commits/commits.rb | 8 +-
features/steps/project/create.rb | 1 +
features/steps/project/forked_merge_requests.rb | 10 +-
features/steps/project/graph.rb | 9 +
features/steps/project/hooks.rb | 4 +-
features/steps/project/issues/award_emoji.rb | 31 +-
features/steps/project/issues/issues.rb | 18 +-
features/steps/project/issues/labels.rb | 20 +-
features/steps/project/issues/milestones.rb | 2 +-
features/steps/project/merge_requests.rb | 54 ++-
.../steps/project/merge_requests/acceptance.rb | 39 +++
features/steps/project/project.rb | 2 +-
features/steps/project/services.rb | 28 +-
features/steps/project/snippets.rb | 2 +-
features/steps/project/source/browse_files.rb | 63 +++-
features/steps/project/source/markdown_render.rb | 6 +-
features/steps/project/team_management.rb | 4 -
features/steps/project/wiki.rb | 14 +-
features/steps/shared/diff_note.rb | 19 +-
features/steps/shared/group.rb | 8 +
features/steps/shared/paths.rb | 8 +-
features/steps/shared/project.rb | 2 +-
features/steps/shared/project_tab.rb | 8 +-
features/steps/shared/user.rb | 12 +
features/steps/snippets/snippets.rb | 2 +-
features/support/capybara.rb | 2 +-
lib/api/api.rb | 1 +
lib/api/commit_statuses.rb | 2 +-
lib/api/entities.rb | 17 +-
lib/api/groups.rb | 12 +
lib/api/helpers.rb | 7 +-
lib/api/merge_requests.rb | 80 +++--
lib/api/project_hooks.rb | 2 +
lib/api/projects.rb | 25 +-
lib/api/triggers.rb | 48 +++
lib/award_emoji.rb | 35 ++
lib/banzai.rb | 13 +
lib/banzai/cross_project_reference.rb | 22 ++
lib/banzai/filter.rb | 10 +
lib/banzai/filter/abstract_reference_filter.rb | 145 ++++++++
lib/banzai/filter/autolink_filter.rb | 107 ++++++
lib/banzai/filter/commit_range_reference_filter.rb | 58 ++++
lib/banzai/filter/commit_reference_filter.rb | 63 ++++
lib/banzai/filter/emoji_filter.rb | 80 +++++
.../filter/external_issue_reference_filter.rb | 83 +++++
lib/banzai/filter/external_link_filter.rb | 34 ++
lib/banzai/filter/issue_reference_filter.rb | 23 ++
lib/banzai/filter/label_reference_filter.rb | 96 ++++++
lib/banzai/filter/markdown_filter.rb | 42 +++
.../filter/merge_request_reference_filter.rb | 41 +++
lib/banzai/filter/redactor_filter.rb | 43 +++
lib/banzai/filter/reference_filter.rb | 190 +++++++++++
lib/banzai/filter/reference_gatherer_filter.rb | 62 ++++
lib/banzai/filter/relative_link_filter.rb | 157 +++++++++
lib/banzai/filter/sanitization_filter.rb | 99 ++++++
lib/banzai/filter/snippet_reference_filter.rb | 25 ++
lib/banzai/filter/syntax_highlight_filter.rb | 45 +++
lib/banzai/filter/table_of_contents_filter.rb | 63 ++++
lib/banzai/filter/task_list_filter.rb | 24 ++
lib/banzai/filter/upload_link_filter.rb | 47 +++
lib/banzai/filter/user_reference_filter.rb | 129 +++++++
lib/banzai/lazy_reference.rb | 27 ++
lib/banzai/pipeline.rb | 10 +
lib/banzai/pipeline/asciidoc_pipeline.rb | 13 +
lib/banzai/pipeline/atom_pipeline.rb | 14 +
lib/banzai/pipeline/base_pipeline.rb | 30 ++
lib/banzai/pipeline/combined_pipeline.rb | 27 ++
lib/banzai/pipeline/description_pipeline.rb | 14 +
lib/banzai/pipeline/email_pipeline.rb | 13 +
lib/banzai/pipeline/full_pipeline.rb | 9 +
lib/banzai/pipeline/gfm_pipeline.rb | 41 +++
lib/banzai/pipeline/note_pipeline.rb | 14 +
lib/banzai/pipeline/plain_markdown_pipeline.rb | 13 +
lib/banzai/pipeline/post_process_pipeline.rb | 20 ++
.../pipeline/reference_extraction_pipeline.rb | 13 +
lib/banzai/pipeline/single_line_pipeline.rb | 9 +
lib/banzai/reference_extractor.rb | 55 +++
lib/banzai/renderer.rb | 78 +++++
lib/ci/api/api.rb | 2 -
lib/ci/api/commits.rb | 66 ----
lib/ci/api/entities.rb | 9 -
lib/ci/api/helpers.rb | 10 +-
lib/ci/api/projects.rb | 195 -----------
lib/ci/api/runners.rb | 15 +-
lib/ci/api/triggers.rb | 2 +-
lib/ci/charts.rb | 2 +-
lib/ci/current_settings.rb | 22 --
lib/ci/git.rb | 5 -
lib/ci/gitlab_ci_yaml_processor.rb | 68 ++--
lib/ci/scheduler.rb | 16 -
lib/email_validator.rb | 21 --
lib/gitlab/asciidoc.rb | 27 +-
lib/gitlab/backend/grack_auth.rb | 4 +-
lib/gitlab/backend/shell.rb | 2 +-
lib/gitlab/bitbucket_import/project_creator.rb | 3 +-
lib/gitlab/blacklist.rb | 34 --
lib/gitlab/build_data_builder.rb | 64 ++++
lib/gitlab/closing_issue_extractor.rb | 16 +-
lib/gitlab/database.rb | 18 +
lib/gitlab/diff/file.rb | 4 +-
lib/gitlab/email/message/repository_push.rb | 137 ++++++++
lib/gitlab/fogbugz_import/importer.rb | 2 +-
lib/gitlab/fogbugz_import/project_creator.rb | 3 +-
lib/gitlab/git/hook.rb | 17 +
lib/gitlab/github_import/client.rb | 2 +-
lib/gitlab/github_import/importer.rb | 2 +-
lib/gitlab/gitlab_import/client.rb | 2 +-
lib/gitlab/gitlab_import/project_creator.rb | 3 +-
lib/gitlab/gitorious_import/project_creator.rb | 3 +-
lib/gitlab/google_code_import/importer.rb | 6 +-
lib/gitlab/google_code_import/project_creator.rb | 3 +-
lib/gitlab/ldap/access.rb | 4 +-
lib/gitlab/lfs/response.rb | 4 +-
lib/gitlab/markdown.rb | 200 -----------
lib/gitlab/markdown/autolink_filter.rb | 107 ------
.../markdown/commit_range_reference_filter.rb | 92 -----
lib/gitlab/markdown/commit_reference_filter.rb | 88 -----
lib/gitlab/markdown/cross_project_reference.rb | 24 --
lib/gitlab/markdown/emoji_filter.rb | 80 -----
.../markdown/external_issue_reference_filter.rb | 63 ----
lib/gitlab/markdown/external_link_filter.rb | 34 --
lib/gitlab/markdown/issue_reference_filter.rb | 72 ----
lib/gitlab/markdown/label_reference_filter.rb | 87 -----
.../markdown/merge_request_reference_filter.rb | 74 ----
lib/gitlab/markdown/pipeline.rb | 34 ++
lib/gitlab/markdown/redactor_filter.rb | 40 ---
lib/gitlab/markdown/reference_filter.rb | 133 --------
lib/gitlab/markdown/reference_gatherer_filter.rb | 63 ----
lib/gitlab/markdown/relative_link_filter.rb | 157 ---------
lib/gitlab/markdown/sanitization_filter.rb | 103 ------
lib/gitlab/markdown/snippet_reference_filter.rb | 74 ----
lib/gitlab/markdown/syntax_highlight_filter.rb | 45 ---
lib/gitlab/markdown/table_of_contents_filter.rb | 63 ----
lib/gitlab/markdown/task_list_filter.rb | 24 --
lib/gitlab/markdown/upload_link_filter.rb | 47 ---
lib/gitlab/markdown/user_reference_filter.rb | 122 -------
lib/gitlab/o_auth/auth_hash.rb | 2 +-
lib/gitlab/push_data_builder.rb | 36 +-
lib/gitlab/reference_extractor.rb | 72 +---
lib/gitlab/seeder.rb | 2 +-
lib/gitlab/sherlock/transaction.rb | 5 +
lib/omni_auth/request_forgery_protection.rb | 63 +---
lib/rouge/formatters/html_gitlab.rb | 2 +-
lib/support/init.d/gitlab | 5 +-
lib/support/init.d/gitlab.default.example | 2 +-
lib/support/nginx/gitlab | 140 +-------
lib/support/nginx/gitlab-ssl | 143 +-------
lib/tasks/ci/schedule_builds.rake | 6 -
lib/tasks/flay.rake | 2 +-
lib/tasks/gitlab/check.rake | 58 +++-
lib/tasks/gitlab/git.rake | 55 +++
lib/tasks/gitlab/import.rake | 2 +
lib/tasks/gitlab/list_repos.rake | 17 +
lib/tasks/gitlab/task_helpers.rake | 20 +-
lib/tasks/spec.rake | 29 +-
lib/tasks/spinach.rake | 26 +-
scripts/prepare_build.sh | 4 +-
shared/lfs-objects/.gitkeep | 0
spec/benchmarks/finders/issues_finder_spec.rb | 55 +++
.../lib/gitlab/markdown/reference_filter_spec.rb | 2 +-
spec/controllers/abuse_reports_controller_spec.rb | 36 +-
.../admin/impersonation_controller_spec.rb | 19 ++
spec/controllers/autocomplete_controller_spec.rb | 9 +-
spec/controllers/commit_controller_spec.rb | 35 ++
.../groups/milestones_controller_spec.rb | 27 ++
.../projects/merge_requests_controller_spec.rb | 24 ++
.../projects/milestones_controller_spec.rb | 5 +-
spec/controllers/projects/raw_controller_spec.rb | 34 ++
spec/controllers/projects_controller_spec.rb | 16 +
spec/controllers/snippets_controller_spec.rb | 115 +++++++
spec/factories.rb | 3 +-
spec/factories/ci/builds.rb | 4 +
spec/factories/ci/commits.rb | 25 +-
spec/factories/ci/events.rb | 24 --
spec/factories/ci/projects.rb | 50 ---
spec/factories/ci/runner_projects.rb | 2 +-
spec/factories/ci/web_hook.rb | 6 -
spec/factories/commit_statuses.rb | 2 +-
spec/factories/lfs_objects.rb | 12 +
spec/factories/lfs_objects_projects.rb | 11 +
spec/factories/merge_requests.rb | 5 +
spec/factories/notes.rb | 1 +
spec/factories/projects.rb | 1 +
spec/features/admin/admin_builds_spec.rb | 69 ++++
spec/features/admin/admin_runners_spec.rb | 86 +++++
spec/features/admin/admin_users_spec.rb | 17 +-
spec/features/builds_spec.rb | 34 +-
spec/features/ci/admin/builds_spec.rb | 70 ----
spec/features/ci/admin/events_spec.rb | 20 --
spec/features/ci/admin/projects_spec.rb | 19 --
spec/features/ci/admin/runners_spec.rb | 64 ----
spec/features/ci_settings_spec.rb | 22 --
spec/features/ci_web_hooks_spec.rb | 27 --
spec/features/commits_spec.rb | 95 ++++--
spec/features/issues/filter_by_milestone_spec.rb | 4 +-
spec/features/issues/note_polling_spec.rb | 16 +
spec/features/issues_spec.rb | 35 +-
spec/features/{ci => }/lint_spec.rb | 0
.../merge_when_build_succeeds_spec.rb | 85 +++++
spec/features/notes_on_merge_requests_spec.rb | 5 +-
spec/features/password_reset_spec.rb | 26 +-
spec/features/runners_spec.rb | 28 +-
spec/features/security/group_access_spec.rb | 4 +-
spec/features/task_lists_spec.rb | 4 +-
spec/features/triggers_spec.rb | 7 +-
spec/features/variables_spec.rb | 7 +-
spec/finders/projects_finder_spec.rb | 17 +-
spec/fixtures/markdown.md.erb | 17 +
spec/helpers/application_helper_spec.rb | 25 +-
spec/helpers/ci_status_helper_spec.rb | 11 +-
spec/helpers/groups_helper.rb | 2 +-
spec/helpers/merge_requests_helper_spec.rb | 41 ++-
spec/helpers/visibility_level_helper_spec.rb | 85 ++---
spec/javascripts/fixtures/issues_show.html.haml | 2 +-
.../fixtures/merge_request_tabs.html.haml | 6 +-
.../fixtures/merge_requests_show.html.haml | 2 +-
spec/lib/banzai/cross_project_reference_spec.rb | 34 ++
spec/lib/banzai/filter/autolink_filter_spec.rb | 112 ++++++
.../filter/commit_range_reference_filter_spec.rb | 182 ++++++++++
.../banzai/filter/commit_reference_filter_spec.rb | 163 +++++++++
spec/lib/banzai/filter/emoji_filter_spec.rb | 98 ++++++
.../filter/external_issue_reference_filter_spec.rb | 77 +++++
.../lib/banzai/filter/external_link_filter_spec.rb | 29 ++
.../banzai/filter/issue_reference_filter_spec.rb | 209 ++++++++++++
.../banzai/filter/label_reference_filter_spec.rb | 179 ++++++++++
.../filter/merge_request_reference_filter_spec.rb | 142 ++++++++
spec/lib/banzai/filter/redactor_filter_spec.rb | 89 +++++
.../filter/reference_gatherer_filter_spec.rb | 87 +++++
.../lib/banzai/filter/relative_link_filter_spec.rb | 147 ++++++++
spec/lib/banzai/filter/sanitization_filter_spec.rb | 197 +++++++++++
.../banzai/filter/snippet_reference_filter_spec.rb | 146 ++++++++
.../banzai/filter/syntax_highlight_filter_spec.rb | 17 +
.../banzai/filter/table_of_contents_filter_spec.rb | 97 ++++++
spec/lib/banzai/filter/task_list_filter_spec.rb | 10 +
spec/lib/banzai/filter/upload_link_filter_spec.rb | 73 ++++
.../banzai/filter/user_reference_filter_spec.rb | 147 ++++++++
spec/lib/ci/ansi2html_spec.rb | 2 +-
spec/lib/ci/charts_spec.rb | 2 +-
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 8 +-
spec/lib/disable_email_interceptor_spec.rb | 2 +-
spec/lib/extracts_path_spec.rb | 2 +-
spec/lib/file_size_validator_spec.rb | 2 +-
spec/lib/git_ref_validator_spec.rb | 2 +-
spec/lib/gitlab/asciidoc_spec.rb | 8 +-
spec/lib/gitlab/auth_spec.rb | 2 +-
spec/lib/gitlab/backend/grack_auth_spec.rb | 11 +-
spec/lib/gitlab/backend/shell_spec.rb | 4 +-
spec/lib/gitlab/bitbucket_import/client_spec.rb | 2 +-
.../bitbucket_import/project_creator_spec.rb | 2 +-
spec/lib/gitlab/build_data_builder_spec.rb | 20 ++
spec/lib/gitlab/closing_issue_extractor_spec.rb | 55 ++-
spec/lib/gitlab/color_schemes_spec.rb | 2 +-
spec/lib/gitlab/database_spec.rb | 2 +-
spec/lib/gitlab/diff/file_spec.rb | 2 +-
spec/lib/gitlab/diff/parser_spec.rb | 2 +-
spec/lib/gitlab/email/attachment_uploader_spec.rb | 2 +-
.../gitlab/email/message/repository_push_spec.rb | 122 +++++++
spec/lib/gitlab/email/receiver_spec.rb | 2 +-
spec/lib/gitlab/email/reply_parser_spec.rb | 2 +-
spec/lib/gitlab/git_access_spec.rb | 2 +-
spec/lib/gitlab/git_access_wiki_spec.rb | 2 +-
spec/lib/gitlab/github_import/client_spec.rb | 2 +-
.../gitlab/github_import/project_creator_spec.rb | 2 +-
spec/lib/gitlab/gitlab_import/client_spec.rb | 2 +-
.../gitlab/gitlab_import/project_creator_spec.rb | 2 +-
.../gitorious_import/project_creator_spec.rb | 2 +-
spec/lib/gitlab/google_code_import/client_spec.rb | 2 +-
.../lib/gitlab/google_code_import/importer_spec.rb | 2 +-
.../google_code_import/project_creator_spec.rb | 2 +-
spec/lib/gitlab/incoming_email_spec.rb | 2 +-
spec/lib/gitlab/inline_diff_spec.rb | 2 +-
spec/lib/gitlab/key_fingerprint_spec.rb | 2 +-
spec/lib/gitlab/ldap/access_spec.rb | 7 +-
spec/lib/gitlab/ldap/adapter_spec.rb | 2 +-
spec/lib/gitlab/ldap/auth_hash_spec.rb | 2 +-
spec/lib/gitlab/ldap/authentication_spec.rb | 2 +-
spec/lib/gitlab/ldap/config_spec.rb | 2 +-
spec/lib/gitlab/ldap/user_spec.rb | 2 +-
spec/lib/gitlab/lfs/lfs_router_spec.rb | 2 +-
spec/lib/gitlab/markdown/autolink_filter_spec.rb | 114 -------
.../markdown/commit_range_reference_filter_spec.rb | 145 --------
.../markdown/commit_reference_filter_spec.rb | 135 --------
.../markdown/cross_project_reference_spec.rb | 36 --
spec/lib/gitlab/markdown/emoji_filter_spec.rb | 95 ------
.../external_issue_reference_filter_spec.rb | 79 -----
.../gitlab/markdown/external_link_filter_spec.rb | 31 --
.../gitlab/markdown/issue_reference_filter_spec.rb | 139 --------
.../gitlab/markdown/label_reference_filter_spec.rb | 144 --------
.../merge_request_reference_filter_spec.rb | 120 -------
spec/lib/gitlab/markdown/redactor_filter_spec.rb | 91 -----
.../markdown/reference_gatherer_filter_spec.rb | 89 -----
.../gitlab/markdown/relative_link_filter_spec.rb | 149 --------
.../gitlab/markdown/sanitization_filter_spec.rb | 199 -----------
.../markdown/snippet_reference_filter_spec.rb | 118 -------
.../markdown/syntax_highlight_filter_spec.rb | 19 --
.../markdown/table_of_contents_filter_spec.rb | 99 ------
spec/lib/gitlab/markdown/task_list_filter_spec.rb | 12 -
.../lib/gitlab/markdown/upload_link_filter_spec.rb | 75 -----
.../gitlab/markdown/user_reference_filter_spec.rb | 122 -------
spec/lib/gitlab/markup_helper_spec.rb | 2 +-
spec/lib/gitlab/note_data_builder_spec.rb | 2 +-
spec/lib/gitlab/o_auth/auth_hash_spec.rb | 6 +-
spec/lib/gitlab/o_auth/user_spec.rb | 2 +-
spec/lib/gitlab/popen_spec.rb | 2 +-
spec/lib/gitlab/project_search_results_spec.rb | 2 +-
spec/lib/gitlab/push_data_builder_spec.rb | 11 +-
spec/lib/gitlab/reference_extractor_spec.rb | 12 +-
spec/lib/gitlab/regex_spec.rb | 2 +-
spec/lib/gitlab/sherlock/collection_spec.rb | 2 +-
spec/lib/gitlab/sherlock/file_sample_spec.rb | 2 +-
spec/lib/gitlab/sherlock/line_profiler_spec.rb | 2 +-
spec/lib/gitlab/sherlock/line_sample_spec.rb | 2 +-
spec/lib/gitlab/sherlock/location_spec.rb | 2 +-
spec/lib/gitlab/sherlock/middleware_spec.rb | 2 +-
spec/lib/gitlab/sherlock/query_spec.rb | 2 +-
spec/lib/gitlab/sherlock/transaction_spec.rb | 15 +-
spec/lib/gitlab/sql/union_spec.rb | 2 +-
spec/lib/gitlab/themes_spec.rb | 2 +-
spec/lib/gitlab/upgrader_spec.rb | 2 +-
spec/lib/gitlab/uploads_transfer_spec.rb | 2 +-
spec/lib/gitlab/url_builder_spec.rb | 2 +-
spec/lib/gitlab/version_info_spec.rb | 2 +-
spec/lib/repository_cache_spec.rb | 2 +-
spec/mailers/ci/notify_spec.rb | 35 --
spec/mailers/notify_spec.rb | 106 +++++-
spec/models/application_setting_spec.rb | 38 +--
spec/models/broadcast_message_spec.rb | 17 +-
spec/models/build_spec.rb | 85 ++---
spec/models/ci/commit_spec.rb | 30 +-
.../ci/project_services/hip_chat_message_spec.rb | 39 ---
.../ci/project_services/hip_chat_service_spec.rb | 73 ----
.../ci/project_services/mail_service_spec.rb | 191 -----------
.../ci/project_services/slack_message_spec.rb | 43 ---
.../ci/project_services/slack_service_spec.rb | 57 ----
spec/models/ci/project_spec.rb | 246 --------------
spec/models/ci/runner_project_spec.rb | 2 +-
spec/models/ci/runner_spec.rb | 10 +-
spec/models/ci/service_spec.rb | 48 ---
spec/models/ci/trigger_spec.rb | 4 +-
spec/models/ci/variable_spec.rb | 2 +-
spec/models/ci/web_hook_spec.rb | 63 ----
spec/models/commit_range_spec.rb | 129 ++++---
spec/models/commit_spec.rb | 34 +-
spec/models/commit_status_spec.rb | 5 +-
spec/models/concerns/case_sensitivity_spec.rb | 2 +-
spec/models/concerns/mentionable_spec.rb | 13 +
spec/models/concerns/strip_attribute_spec.rb | 20 ++
spec/models/concerns/token_authenticatable_spec.rb | 57 ++++
spec/models/deploy_key_spec.rb | 2 +-
spec/models/deploy_keys_project_spec.rb | 2 +-
spec/models/event_spec.rb | 2 +-
spec/models/external_issue_spec.rb | 2 +-
spec/models/external_wiki_service_spec.rb | 2 +-
spec/models/generic_commit_status_spec.rb | 2 +-
spec/models/global_milestone_spec.rb | 2 +-
spec/models/group_spec.rb | 2 +-
spec/models/hooks/project_hook_spec.rb | 2 +-
spec/models/hooks/service_hook_spec.rb | 2 +-
spec/models/hooks/system_hook_spec.rb | 2 +-
spec/models/hooks/web_hook_spec.rb | 8 +-
spec/models/issue_spec.rb | 2 +-
spec/models/jira_issue_spec.rb | 30 ++
spec/models/key_spec.rb | 4 +-
spec/models/label_link_spec.rb | 2 +-
spec/models/label_spec.rb | 2 +-
spec/models/member_spec.rb | 2 +-
spec/models/members/group_member_spec.rb | 2 +-
spec/models/members/project_member_spec.rb | 2 +-
spec/models/merge_request_spec.rb | 79 ++++-
spec/models/milestone_spec.rb | 2 +-
spec/models/namespace_spec.rb | 2 +-
spec/models/note_spec.rb | 29 +-
spec/models/project_security_spec.rb | 2 +-
.../project_services/buildkite_service_spec.rb | 2 +-
.../project_services/drone_ci_service_spec.rb | 2 +-
.../project_services/flowdock_service_spec.rb | 2 +-
.../project_services/gemnasium_service_spec.rb | 2 +-
.../project_services/gitlab_ci_service_spec.rb | 57 ----
.../gitlab_issue_tracker_service_spec.rb | 2 +-
.../project_services/hipchat_service_spec.rb | 73 +++-
spec/models/project_services/irker_service_spec.rb | 2 +-
spec/models/project_services/jira_service_spec.rb | 126 ++++++-
.../project_services/pushover_service_spec.rb | 2 +-
.../slack_service/build_message_spec.rb | 46 +++
.../slack_service/issue_message_spec.rb | 2 +-
.../slack_service/merge_message_spec.rb | 2 +-
.../slack_service/note_message_spec.rb | 10 +-
.../slack_service/push_message_spec.rb | 2 +-
spec/models/project_services/slack_service_spec.rb | 2 +-
spec/models/project_snippet_spec.rb | 2 +-
spec/models/project_spec.rb | 102 +++++-
spec/models/project_team_spec.rb | 2 +-
spec/models/project_wiki_spec.rb | 2 +-
spec/models/protected_branch_spec.rb | 2 +-
spec/models/repository_spec.rb | 121 ++++++-
spec/models/service_spec.rb | 2 +-
spec/models/snippet_spec.rb | 2 +-
spec/models/user_spec.rb | 26 +-
spec/models/wiki_page_spec.rb | 2 +-
spec/requests/api/groups_spec.rb | 59 +++-
spec/requests/api/labels_spec.rb | 10 +-
spec/requests/api/merge_requests_spec.rb | 36 +-
spec/requests/api/project_hooks_spec.rb | 12 +-
spec/requests/api/projects_spec.rb | 91 +++--
spec/requests/api/services_spec.rb | 2 +-
spec/requests/api/triggers_spec.rb | 80 +++++
spec/requests/api/users_spec.rb | 4 +-
spec/requests/ci/api/builds_spec.rb | 40 ++-
spec/requests/ci/api/commits_spec.rb | 65 ----
spec/requests/ci/api/projects_spec.rb | 232 -------------
spec/requests/ci/api/runners_spec.rb | 37 +-
spec/requests/ci/api/triggers_spec.rb | 21 +-
spec/services/archive_repository_service_spec.rb | 2 +-
spec/services/ci/create_commit_service_spec.rb | 172 ----------
.../ci/create_trigger_request_service_spec.rb | 7 +-
spec/services/ci/event_service_spec.rb | 34 --
spec/services/ci/image_for_build_service_spec.rb | 10 +-
spec/services/ci/register_build_service_spec.rb | 12 +-
spec/services/ci/web_hook_service_spec.rb | 37 --
spec/services/create_commit_builds_service_spec.rb | 175 ++++++++++
spec/services/create_release_service_spec.rb | 34 ++
spec/services/create_snippet_service_spec.rb | 2 +-
spec/services/destroy_group_service_spec.rb | 2 +-
spec/services/event_create_service_spec.rb | 2 +-
spec/services/git_hooks_service_spec.rb | 53 +++
spec/services/git_push_service_spec.rb | 71 +++-
spec/services/git_tag_push_service_spec.rb | 18 +-
spec/services/issues/bulk_update_service_spec.rb | 2 +-
spec/services/issues/close_service_spec.rb | 6 +-
spec/services/issues/create_service_spec.rb | 2 +-
spec/services/issues/update_service_spec.rb | 90 ++++-
spec/services/merge_requests/close_service_spec.rb | 6 +-
.../services/merge_requests/create_service_spec.rb | 2 +-
spec/services/merge_requests/merge_service_spec.rb | 12 +-
.../merge_when_build_succeeds_service_spec.rb | 84 +++++
.../merge_requests/refresh_service_spec.rb | 8 +-
.../services/merge_requests/reopen_service_spec.rb | 6 +-
.../services/merge_requests/update_service_spec.rb | 59 +++-
spec/services/milestones/close_service_spec.rb | 2 +-
spec/services/milestones/create_service_spec.rb | 2 +-
spec/services/notes/create_service_spec.rb | 2 +-
spec/services/notification_service_spec.rb | 350 ++++++++-----------
spec/services/projects/create_service_spec.rb | 9 +-
spec/services/projects/destroy_service_spec.rb | 2 +-
spec/services/projects/download_service_spec.rb | 2 +-
spec/services/projects/fork_service_spec.rb | 2 +-
spec/services/projects/transfer_service_spec.rb | 2 +-
spec/services/projects/update_service_spec.rb | 2 +-
spec/services/projects/upload_service_spec.rb | 2 +-
spec/services/search_service_spec.rb | 2 +-
spec/services/system_hooks_service_spec.rb | 2 +-
spec/services/system_note_service_spec.rb | 89 ++++-
spec/services/test_hook_service_spec.rb | 2 +-
spec/services/update_release_service_spec.rb | 34 ++
spec/services/update_snippet_service_spec.rb | 4 +-
spec/spec_helper.rb | 1 +
spec/support/filter_spec_helper.rb | 39 ++-
spec/support/jira_service_helper.rb | 67 ++++
spec/support/markdown_feature.rb | 4 +
spec/support/matchers/markdown_matchers.rb | 14 +-
spec/support/mentionable_shared_examples.rb | 23 +-
spec/support/repo_helpers.rb | 12 +-
spec/support/stub_gitlab_calls.rb | 4 +
spec/support/test_env.rb | 4 +-
spec/support/wait_for_ajax.rb | 11 +
spec/workers/build_email_worker_spec.rb | 35 ++
spec/workers/email_receiver_worker_spec.rb | 14 +-
spec/workers/repository_fork_worker_spec.rb | 20 +-
spec/workers/stuck_ci_builds_worker_spec.rb | 4 +-
1168 files changed, 19450 insertions(+), 14569 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git
More information about the Pkg-ruby-extras-commits
mailing list