[DRE-commits] [gitlab] 01/05: Merge tag 'upstream/8.4.0+dfsg_rc1' into master-8.4
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Thu Jan 14 13:43:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master-8.4
in repository gitlab.
commit 21d2216d5a02fe460163203be021eb75504eff9e
Merge: 26609af cadc905
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Jan 14 18:38:09 2016 +0530
Merge tag 'upstream/8.4.0+dfsg_rc1' into master-8.4
Upstream version 8.4.0+dfsg~rc1
# gpg: Signature made Thursday 14 January 2016 06:38:03 PM 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>"
.gitignore | 1 +
.gitlab-ci.yml | 1 +
CHANGELOG | 76 +-
CONTRIBUTING.md | 24 +-
GITLAB_SHELL_VERSION | 2 +-
GITLAB_WORKHORSE_VERSION | 2 +-
Gemfile | 41 +-
Gemfile.lock | 194 +-
LICENSE | 2 +-
VERSION | 2 +-
app/assets/fonts/OFL.txt | 7 +-
app/assets/fonts/SourceSansPro-Black.ttf | Bin 289364 -> 0 bytes
app/assets/fonts/SourceSansPro-Black.ttf.woff | Bin 0 -> 113800 bytes
app/assets/fonts/SourceSansPro-BlackIt.ttf | Bin 103404 -> 0 bytes
app/assets/fonts/SourceSansPro-BlackIt.ttf.woff | Bin 0 -> 49704 bytes
app/assets/fonts/SourceSansPro-BlackItalic.ttf | Bin 116360 -> 0 bytes
app/assets/fonts/SourceSansPro-Bold.ttf | Bin 291424 -> 0 bytes
app/assets/fonts/SourceSansPro-Bold.ttf.woff | Bin 0 -> 117872 bytes
app/assets/fonts/SourceSansPro-BoldIt.ttf | Bin 103608 -> 0 bytes
app/assets/fonts/SourceSansPro-BoldIt.ttf.woff | Bin 0 -> 50608 bytes
app/assets/fonts/SourceSansPro-BoldItalic.ttf | Bin 116192 -> 0 bytes
app/assets/fonts/SourceSansPro-ExtraLight.ttf | Bin 291652 -> 0 bytes
app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff | Bin 0 -> 114336 bytes
app/assets/fonts/SourceSansPro-ExtraLightIt.ttf | Bin 104768 -> 0 bytes
.../fonts/SourceSansPro-ExtraLightIt.ttf.woff | Bin 0 -> 49684 bytes
.../fonts/SourceSansPro-ExtraLightItalic.ttf | Bin 117140 -> 0 bytes
app/assets/fonts/SourceSansPro-It.ttf | Bin 104236 -> 0 bytes
app/assets/fonts/SourceSansPro-It.ttf.woff | Bin 0 -> 51012 bytes
app/assets/fonts/SourceSansPro-Italic.ttf | Bin 117328 -> 0 bytes
app/assets/fonts/SourceSansPro-Light.ttf | Bin 293220 -> 0 bytes
app/assets/fonts/SourceSansPro-Light.ttf.woff | Bin 0 -> 118284 bytes
app/assets/fonts/SourceSansPro-LightIt.ttf | Bin 104616 -> 0 bytes
app/assets/fonts/SourceSansPro-LightIt.ttf.woff | Bin 0 -> 50992 bytes
app/assets/fonts/SourceSansPro-LightItalic.ttf | Bin 116960 -> 0 bytes
app/assets/fonts/SourceSansPro-Regular.ttf | Bin 293956 -> 0 bytes
app/assets/fonts/SourceSansPro-Regular.ttf.woff | Bin 0 -> 119064 bytes
app/assets/fonts/SourceSansPro-Semibold.ttf | Bin 292404 -> 0 bytes
app/assets/fonts/SourceSansPro-Semibold.ttf.woff | Bin 0 -> 118412 bytes
app/assets/fonts/SourceSansPro-SemiboldIt.ttf | Bin 104020 -> 0 bytes
app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff | Bin 0 -> 50924 bytes
app/assets/fonts/SourceSansPro-SemiboldItalic.ttf | Bin 116424 -> 0 bytes
app/assets/images/auth_buttons/azure_64.png | Bin 0 -> 986 bytes
app/assets/images/brand_logo.png | Bin 27059 -> 0 bytes
app/assets/images/emoji.png | Bin 0 -> 832902 bytes
app/assets/images/gitlab_logo.png | Bin 0 -> 5189 bytes
app/assets/javascripts/application.js.coffee | 9 +-
app/assets/javascripts/awards_handler.coffee | 103 +-
.../javascripts/blob/blob_file_dropzone.js.coffee | 2 +-
app/assets/javascripts/branch-graph.js.coffee | 2 +-
app/assets/javascripts/calendar.js.coffee | 5 -
app/assets/javascripts/commits.js.coffee | 66 +-
app/assets/javascripts/dispatcher.js.coffee | 6 +-
app/assets/javascripts/dropzone_input.js.coffee | 14 +-
app/assets/javascripts/gfm_auto_complete.js.coffee | 8 +-
app/assets/javascripts/issue.js.coffee | 44 +-
app/assets/javascripts/issues.js.coffee | 11 +-
app/assets/javascripts/logo.js.coffee | 44 +
app/assets/javascripts/merge_request.js.coffee | 22 +
.../javascripts/merge_request_widget.js.coffee | 2 +-
app/assets/javascripts/merge_requests.js.coffee | 4 +-
app/assets/javascripts/new_branch_form.js.coffee | 78 +
app/assets/javascripts/new_commit_form.js.coffee | 2 +-
app/assets/javascripts/notes.js.coffee | 16 +-
app/assets/javascripts/project.js.coffee | 5 +-
app/assets/javascripts/project_find_file.js.coffee | 125 +
app/assets/javascripts/projects_list.js.coffee | 10 +-
app/assets/javascripts/shortcuts.js.coffee | 10 +-
.../javascripts/shortcuts_find_file.js.coffee | 19 +
app/assets/javascripts/shortcuts_tree.coffee | 4 +
app/assets/javascripts/star.js.coffee | 22 +
app/assets/javascripts/users_select.js.coffee | 2 +-
app/assets/javascripts/zen_mode.js.coffee | 104 +-
app/assets/stylesheets/application.scss | 6 +-
app/assets/stylesheets/framework/blocks.scss | 11 +-
app/assets/stylesheets/framework/buttons.scss | 39 +-
app/assets/stylesheets/framework/calendar.scss | 42 +-
app/assets/stylesheets/framework/common.scss | 7 +-
app/assets/stylesheets/framework/fonts.scss | 8 +-
app/assets/stylesheets/framework/issue_box.scss | 4 +-
app/assets/stylesheets/framework/layout.scss | 2 +-
app/assets/stylesheets/framework/lists.scss | 6 +-
app/assets/stylesheets/framework/mixins.scss | 9 +-
app/assets/stylesheets/framework/mobile.scss | 2 +-
app/assets/stylesheets/framework/sidebar.scss | 2 +-
app/assets/stylesheets/framework/typography.scss | 6 +-
app/assets/stylesheets/framework/variables.scss | 32 +-
app/assets/stylesheets/framework/zen.scss | 99 +-
app/assets/stylesheets/pages/awards.scss | 79 +-
app/assets/stylesheets/pages/commits.scss | 60 +-
app/assets/stylesheets/pages/detail_page.scss | 2 +-
app/assets/stylesheets/pages/emojis.scss | 1272 ++
app/assets/stylesheets/pages/events.scss | 1 +
app/assets/stylesheets/pages/issuable.scss | 10 +-
app/assets/stylesheets/pages/issues.scss | 5 +
app/assets/stylesheets/pages/note_form.scss | 5 +-
app/assets/stylesheets/pages/notes.scss | 2 +-
app/assets/stylesheets/pages/projects.scss | 138 +-
app/assets/stylesheets/pages/tree.scss | 8 +
app/controllers/abuse_reports_controller.rb | 11 +-
app/controllers/admin/abuse_reports_controller.rb | 6 +-
.../admin/application_settings_controller.rb | 11 +
app/controllers/admin/builds_controller.rb | 6 +-
app/controllers/application_controller.rb | 41 +-
app/controllers/ci/lints_controller.rb | 10 +-
app/controllers/concerns/creates_commit.rb | 103 +
.../concerns/creates_merge_request_for_commit.rb | 28 -
app/controllers/explore/groups_controller.rb | 2 +-
app/controllers/omniauth_callbacks_controller.rb | 16 +-
.../profiles/two_factor_auths_controller.rb | 25 +-
app/controllers/projects/blob_controller.rb | 94 +-
app/controllers/projects/branches_controller.rb | 5 +
app/controllers/projects/builds_controller.rb | 6 +-
app/controllers/projects/commits_controller.rb | 12 +-
app/controllers/projects/find_file_controller.rb | 26 +
app/controllers/projects/forks_controller.rb | 28 +-
app/controllers/projects/imports_controller.rb | 29 +-
.../projects/merge_requests_controller.rb | 2 +-
app/controllers/projects/notes_controller.rb | 1 -
app/controllers/projects/refs_controller.rb | 2 +
app/controllers/projects/tree_controller.rb | 38 +-
app/controllers/projects_controller.rb | 15 +-
app/controllers/registrations_controller.rb | 23 +
app/controllers/sessions_controller.rb | 18 +-
app/controllers/users_controller.rb | 2 +-
app/finders/groups_finder.rb | 44 -
app/finders/issuable_finder.rb | 4 +-
app/finders/joined_groups_finder.rb | 49 -
app/helpers/application_helper.rb | 6 +-
app/helpers/auth_helper.rb | 14 +-
app/helpers/blob_helper.rb | 102 +-
app/helpers/issues_helper.rb | 38 +-
app/helpers/notes_helper.rb | 2 +-
app/helpers/page_layout_helper.rb | 59 +
app/helpers/projects_helper.rb | 16 +-
app/helpers/search_helper.rb | 2 +-
app/helpers/sorting_helper.rb | 8 +-
app/helpers/tree_helper.rb | 41 +-
app/helpers/visibility_level_helper.rb | 3 +-
app/mailers/abuse_report_mailer.rb | 10 +-
app/mailers/emails/notes.rb | 2 +-
app/models/ability.rb | 18 +-
app/models/abuse_report.rb | 11 +
app/models/application_setting.rb | 100 +-
app/models/ci/build.rb | 76 +-
app/models/ci/runner_project.rb | 11 +-
app/models/ci/trigger.rb | 13 +-
app/models/ci/variable.rb | 3 +-
app/models/commit_status.rb | 55 +-
app/models/concerns/issuable.rb | 14 +-
app/models/concerns/mentionable.rb | 9 +-
app/models/concerns/sortable.rb | 3 +
app/models/concerns/token_authenticatable.rb | 20 +-
app/models/generic_commit_status.rb | 1 +
app/models/global_milestone.rb | 6 +-
app/models/group.rb | 9 -
app/models/hooks/project_hook.rb | 1 +
app/models/hooks/service_hook.rb | 1 +
app/models/hooks/system_hook.rb | 1 +
app/models/hooks/web_hook.rb | 3 +-
app/models/identity.rb | 1 +
app/models/issue.rb | 4 +-
app/models/merge_request.rb | 62 +-
app/models/milestone.rb | 26 +-
app/models/namespace.rb | 1 -
app/models/note.rb | 15 +-
app/models/project.rb | 57 +-
app/models/project_services/asana_service.rb | 84 +-
app/models/project_services/assembla_service.rb | 1 +
app/models/project_services/bamboo_service.rb | 1 +
app/models/project_services/buildkite_service.rb | 1 +
.../project_services/builds_email_service.rb | 7 +-
app/models/project_services/campfire_service.rb | 1 +
app/models/project_services/ci_service.rb | 1 +
.../custom_issue_tracker_service.rb | 1 +
app/models/project_services/drone_ci_service.rb | 1 +
.../project_services/emails_on_push_service.rb | 1 +
.../project_services/external_wiki_service.rb | 1 +
app/models/project_services/flowdock_service.rb | 1 +
app/models/project_services/gemnasium_service.rb | 1 +
app/models/project_services/gitlab_ci_service.rb | 1 +
.../gitlab_issue_tracker_service.rb | 1 +
app/models/project_services/hipchat_service.rb | 1 +
app/models/project_services/irker_service.rb | 8 +-
.../project_services/issue_tracker_service.rb | 1 +
app/models/project_services/jira_service.rb | 11 +-
.../project_services/pivotaltracker_service.rb | 1 +
app/models/project_services/pushover_service.rb | 1 +
app/models/project_services/redmine_service.rb | 1 +
app/models/project_services/slack_service.rb | 1 +
app/models/project_services/teamcity_service.rb | 1 +
app/models/repository.rb | 112 +-
app/models/service.rb | 1 +
app/models/tree.rb | 14 +-
app/models/user.rb | 118 +-
app/services/base_service.rb | 5 +-
app/services/create_branch_service.rb | 20 +-
app/services/create_tag_service.rb | 1 +
app/services/delete_branch_service.rb | 1 -
app/services/files/base_service.rb | 26 +-
app/services/files/create_service.rb | 2 +-
app/services/notification_service.rb | 1 +
app/services/projects/download_service.rb | 8 +-
app/services/projects/housekeeping_service.rb | 20 +
app/services/projects/transfer_service.rb | 3 +
app/services/projects/update_service.rb | 28 +-
app/services/projects/upload_service.rb | 8 +-
app/services/system_hooks_service.rb | 17 +-
app/services/system_note_service.rb | 6 +-
app/uploaders/artifact_uploader.rb | 8 +-
app/uploaders/file_uploader.rb | 15 +
app/validators/namespace_validator.rb | 1 +
app/views/abuse_report_mailer/notify.html.haml | 2 +-
app/views/abuse_reports/new.html.haml | 4 +-
.../admin/abuse_reports/_abuse_report.html.haml | 23 +-
app/views/admin/abuse_reports/index.html.haml | 3 +-
.../admin/application_settings/_form.html.haml | 83 +-
app/views/admin/builds/index.html.haml | 14 +-
app/views/admin/dashboard/index.html.haml | 26 +-
app/views/admin/groups/index.html.haml | 2 +-
app/views/admin/groups/show.html.haml | 2 +-
app/views/admin/labels/index.html.haml | 2 +-
app/views/admin/projects/show.html.haml | 4 +-
app/views/admin/runners/index.html.haml | 2 +-
app/views/admin/users/_head.html.haml | 4 +-
app/views/admin/users/_profile.html.haml | 2 +-
app/views/admin/users/index.html.haml | 14 +-
app/views/admin/users/show.html.haml | 24 +-
app/views/ci/lints/_create.html.haml | 2 -
app/views/ci/lints/create.js.haml | 2 -
app/views/ci/lints/show.html.haml | 36 +-
app/views/dashboard/_projects_head.html.haml | 27 +-
app/views/dashboard/issues.atom.builder | 2 +-
app/views/dashboard/milestones/show.html.haml | 2 +-
app/views/dashboard/projects/_projects.html.haml | 8 -
app/views/dashboard/projects/index.atom.builder | 2 +-
app/views/devise/shared/_signup_box.html.haml | 12 +-
app/views/events/_event.html.haml | 2 +-
app/views/events/_event_last_push.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/_projects.html.haml | 4 +-
app/views/groups/edit.html.haml | 9 -
app/views/groups/issues.atom.builder | 2 +-
app/views/groups/show.atom.builder | 2 +-
app/views/groups/show.html.haml | 81 +-
app/views/help/_shortcuts.html.haml | 34 +-
app/views/layouts/_head.html.haml | 28 +-
app/views/layouts/_init_auto_complete.html.haml | 8 +-
app/views/layouts/group.html.haml | 7 +-
app/views/layouts/nav/_admin.html.haml | 6 +-
app/views/layouts/nav/_dashboard.html.haml | 4 +-
app/views/layouts/nav/_group.html.haml | 4 +-
app/views/layouts/nav/_profile.html.haml | 4 +-
app/views/layouts/nav/_project.html.haml | 9 +-
app/views/layouts/project.html.haml | 7 +-
app/views/notify/repository_push_email.html.haml | 2 +-
app/views/notify/repository_push_email.text.haml | 2 +-
app/views/profiles/keys/_key_details.html.haml | 2 +-
app/views/profiles/keys/new.html.haml | 2 +-
app/views/profiles/two_factor_auths/new.html.haml | 1 +
app/views/projects/_commit_button.html.haml | 4 +
app/views/projects/_find_file_link.html.haml | 3 +
app/views/projects/_home_panel.html.haml | 26 +-
app/views/projects/_zen.html.haml | 9 +-
app/views/projects/blob/_actions.html.haml | 15 +-
app/views/projects/blob/_new_dir.html.haml | 4 +
app/views/projects/blob/_upload.html.haml | 5 +
app/views/projects/blob/edit.html.haml | 2 +-
app/views/projects/blob/show.html.haml | 2 +-
app/views/projects/branches/_branch.html.haml | 15 +
app/views/projects/branches/new.html.haml | 10 +-
app/views/projects/builds/index.html.haml | 14 +-
app/views/projects/builds/show.html.haml | 4 +
app/views/projects/buttons/_dropdown.html.haml | 25 +-
app/views/projects/buttons/_fork.html.haml | 5 +
app/views/projects/buttons/_star.html.haml | 22 +-
app/views/projects/commit/show.html.haml | 4 +-
app/views/projects/commits/_commit.html.haml | 2 +-
app/views/projects/commits/_commits.html.haml | 2 +-
app/views/projects/commits/show.atom.builder | 4 +-
app/views/projects/commits/show.html.haml | 26 +-
app/views/projects/diffs/_file.html.haml | 7 +-
app/views/projects/edit.html.haml | 13 +
app/views/projects/find_file/show.html.haml | 27 +
app/views/projects/forks/new.html.haml | 1 -
app/views/projects/hooks/index.html.haml | 4 +-
app/views/projects/issues/_closed_by_box.html.haml | 6 +-
app/views/projects/issues/_discussion.html.haml | 6 +-
app/views/projects/issues/_issues.html.haml | 2 +-
.../projects/issues/_merge_requests.html.haml | 6 +-
app/views/projects/issues/index.atom.builder | 2 +-
app/views/projects/issues/show.html.haml | 25 +-
.../projects/merge_requests/_discussion.html.haml | 4 +-
.../merge_requests/_merge_request.html.haml | 2 +-
.../merge_requests/_merge_requests.html.haml | 2 +-
app/views/projects/merge_requests/_show.html.haml | 7 +-
app/views/projects/merge_requests/index.html.haml | 5 +-
.../merge_requests/show/_mr_title.html.haml | 6 +-
app/views/projects/milestones/show.html.haml | 4 +-
app/views/projects/notes/_edit_form.html.haml | 4 +-
app/views/projects/notes/_form.html.haml | 4 +-
app/views/projects/show.atom.builder | 2 +-
app/views/projects/show.html.haml | 11 -
app/views/projects/tree/_tree_content.html.haml | 2 +-
app/views/projects/tree/_tree_header.html.haml | 89 +-
app/views/projects/tree/show.html.haml | 8 +-
app/views/search/results/_issue.html.haml | 2 +-
app/views/shared/_clone_panel.html.haml | 29 +-
app/views/shared/_logo.svg | 14 +-
app/views/shared/_new_commit_form.html.haml | 28 +-
app/views/shared/_service_settings.html.haml | 4 +-
app/views/shared/issuable/_filter.html.haml | 22 +-
app/views/shared/issuable/_sidebar.html.haml | 19 +-
app/views/shared/projects/_project.html.haml | 13 +-
app/views/users/show.atom.builder | 2 +-
app/views/users/show.html.haml | 7 +-
app/views/votes/_votes_block.html.haml | 55 +-
config/database.yml.env | 9 +
config/gitlab.yml.example | 31 +-
config/initializers/1_settings.rb | 23 +-
config/initializers/date_time_formats.rb | 9 +
config/initializers/devise.rb | 10 +
config/initializers/metrics.rb | 63 +
config/initializers/sidekiq.rb | 11 +-
config/routes.rb | 26 +-
config/schedule.rb | 8 -
config/schedule.yml | 10 -
.../20151203162134_add_build_events_to_services.rb | 2 +-
db/migrate/20151209144329_migrate_ci_web_hooks.rb | 3 +
db/migrate/20151210125928_add_ci_to_project.rb | 2 +-
db/migrate/20151210125929_add_project_id_to_ci.rb | 2 +-
db/migrate/20151210125930_migrate_ci_to_project.rb | 4 +
.../20151210125931_add_index_to_ci_tables.rb | 2 +-
.../20151210125932_drop_null_for_ci_tables.rb | 2 +-
...151218154042_add_tfa_to_application_settings.rb | 8 +
.../20151221234414_add_tfa_additional_fields.rb | 7 +
db/migrate/20151224123230_rename_emojis.rb | 15 +
.../20151228111122_remove_public_from_namespace.rb | 6 +
db/migrate/20151228150906_influxdb_settings.rb | 18 +
...175719_add_recaptcha_to_application_settings.rb | 9 +
.../20151229102248_influxdb_udp_port_setting.rb | 5 +
...51229112614_influxdb_remote_database_setting.rb | 5 +
.../20160106162223_add_index_milestones_title.rb | 5 +
.../20160106164438_remove_influxdb_credentials.rb | 6 +
db/schema.rb | 518 +-
doc/README.md | 15 +-
doc/administration/environment_variables.md | 53 +
doc/api/merge_requests.md | 17 +-
doc/api/notes.md | 3 +-
doc/api/projects.md | 38 +
doc/api/tags.md | 20 +
doc/api/users.md | 19 +-
doc/ci/README.md | 33 +-
doc/ci/docker/using_docker_images.md | 2 +-
doc/ci/enable_or_disable_ci.md | 70 +
doc/ci/img/features_settings.png | Bin 0 -> 18691 bytes
doc/ci/runners/README.md | 5 +-
doc/ci/triggers/README.md | 172 +
doc/ci/triggers/img/builds_page.png | Bin 0 -> 39713 bytes
doc/ci/triggers/img/trigger_single_build.png | Bin 0 -> 2895 bytes
doc/ci/triggers/img/trigger_variables.png | Bin 0 -> 5418 bytes
doc/ci/triggers/img/triggers_page.png | Bin 0 -> 15889 bytes
doc/install/installation.md | 10 +-
doc/integration/README.md | 31 +-
doc/integration/azure.md | 83 +
doc/integration/cas.md | 62 +
doc/integration/external-issue-tracker.md | 48 +-
doc/integration/{ => img}/jira_issue_reference.png | Bin
doc/integration/img/jira_merge_request_close.png | Bin 0 -> 111150 bytes
doc/integration/{ => img}/jira_project_name.png | Bin
doc/integration/{ => img}/jira_service.png | Bin
.../{ => img}/jira_service_close_issue.png | Bin
doc/integration/img/jira_service_page.png | Bin 0 -> 35496 bytes
.../{ => img}/jira_workflow_screenshot.png | Bin
doc/integration/jira.md | 138 +-
doc/integration/jira_service_page.png | Bin 162449 -> 0 bytes
doc/integration/ldap.md | 5 +
doc/integration/omniauth.md | 1 +
doc/integration/recaptcha.md | 23 +
doc/integration/redmine_configuration.png | Bin 118752 -> 0 bytes
doc/integration/redmine_service_template.png | Bin 198077 -> 0 bytes
doc/integration/shibboleth.md | 4 +-
doc/permissions/permissions.md | 6 +-
doc/project_services/img/redmine_configuration.png | Bin 0 -> 21061 bytes
.../img/services_templates_redmine_example.png | Bin 0 -> 17351 bytes
doc/project_services/project_services.md | 49 +-
doc/project_services/redmine.md | 21 +
doc/project_services/services_templates.md | 25 +
doc/raketasks/backup_restore.md | 43 +
doc/release/patch.md | 2 +-
doc/security/README.md | 2 +
doc/security/crime_vulnerability.md | 63 +
doc/security/two_factor_authentication.md | 38 +
doc/ssh/README.md | 11 +-
doc/system_hooks/system_hooks.md | 56 +-
doc/update/8.2-to-8.3.md | 4 +-
doc/update/{8.2-to-8.3.md => 8.3-to-8.4.md} | 82 +-
doc/update/patch_versions.md | 1 +
doc/workflow/add-user/add-user.md | 90 +-
doc/workflow/add-user/images/add-members.png | Bin 2361 -> 0 bytes
doc/workflow/add-user/images/new-member.png | Bin 12038 -> 0 bytes
doc/workflow/add-user/images/select-project.png | Bin 4042 -> 0 bytes
.../img/add_new_user_to_project_settings.png | Bin 0 -> 22822 bytes
.../add-user/img/add_user_email_accept.png | Bin 0 -> 10833 bytes
doc/workflow/add-user/img/add_user_email_ready.png | Bin 0 -> 16177 bytes
.../add-user/img/add_user_email_search.png | Bin 0 -> 15889 bytes
.../add-user/img/add_user_give_permissions.png | Bin 0 -> 22089 bytes
...dd_user_import_members_from_another_project.png | Bin 0 -> 18897 bytes
.../add-user/img/add_user_imported_members.png | Bin 0 -> 23897 bytes
.../add-user/img/add_user_list_members.png | Bin 0 -> 15732 bytes
.../members.png => img/add_user_members_menu.png} | Bin
.../add-user/img/add_user_search_people.png | Bin 0 -> 13518 bytes
.../importing/import_projects_from_github.md | 4 +-
doc/workflow/shortcuts.png | Bin 78736 -> 48782 bytes
features/explore/groups.feature | 15 -
features/project/commits/branches.feature | 1 +
features/project/commits/commits.feature | 5 +
features/project/create.feature | 1 +
features/project/find_file.feature | 42 +
features/project/fork.feature | 11 +
features/project/issues/award_emoji.feature | 15 +-
features/project/merge_requests/accept.feature | 8 +
features/project/source/browse_files.feature | 106 +-
features/project/star.feature | 1 +
features/steps/group/milestones.rb | 2 +-
features/steps/project/commits/branches.rb | 3 +-
features/steps/project/commits/commits.rb | 9 +
features/steps/project/create.rb | 6 +-
features/steps/project/fork.rb | 19 +
features/steps/project/issues/award_emoji.rb | 31 +-
features/steps/project/issues/issues.rb | 9 +-
.../steps/project/merge_requests/acceptance.rb | 4 +
features/steps/project/project_find_file.rb | 73 +
features/steps/project/source/browse_files.rb | 35 +-
features/steps/project/star.rb | 2 +-
features/steps/shared/paths.rb | 4 +
fixtures/emojis/aliases.json | 367 +
fixtures/emojis/index.json | 13376 +++++++++++++++++++
lib/api/entities.rb | 1 -
lib/api/files.rb | 2 +-
lib/api/merge_requests.rb | 2 +-
lib/api/projects.rb | 20 +-
lib/api/tags.rb | 21 +
lib/api/users.rb | 16 +-
lib/award_emoji.rb | 84 +-
lib/banzai/filter/abstract_reference_filter.rb | 73 +-
.../filter/external_issue_reference_filter.rb | 6 +-
lib/banzai/filter/label_reference_filter.rb | 2 +-
lib/banzai/filter/milestone_reference_filter.rb | 22 +
lib/banzai/filter/redactor_filter.rb | 8 +-
lib/banzai/filter/reference_filter.rb | 14 +-
lib/banzai/filter/reference_gatherer_filter.rb | 10 +-
lib/banzai/filter/relative_link_filter.rb | 2 +-
lib/banzai/filter/task_list_filter.rb | 13 +-
lib/banzai/filter/user_reference_filter.rb | 16 +-
lib/banzai/pipeline/gfm_pipeline.rb | 1 +
lib/banzai/pipeline/single_line_pipeline.rb | 16 +
lib/banzai/querying.rb | 18 +
lib/banzai/renderer.rb | 4 +-
lib/ci/api/helpers.rb | 2 +-
lib/gitlab/backend/shell.rb | 12 +
lib/gitlab/build_data_builder.rb | 1 +
lib/gitlab/contributions_calendar.rb | 4 +-
lib/gitlab/current_settings.rb | 7 +-
lib/gitlab/email/receiver.rb | 7 +-
lib/gitlab/fogbugz_import/importer.rb | 4 +-
lib/gitlab/git.rb | 4 +
lib/gitlab/github_import/base_formatter.rb | 21 +
lib/gitlab/github_import/comment_formatter.rb | 45 +
lib/gitlab/github_import/importer.rb | 64 +-
lib/gitlab/github_import/issue_formatter.rb | 66 +
lib/gitlab/github_import/pull_request_formatter.rb | 101 +
lib/gitlab/ldap/access.rb | 8 +-
lib/gitlab/ldap/adapter.rb | 24 +-
lib/gitlab/ldap/config.rb | 4 +
lib/gitlab/ldap/user.rb | 6 +-
lib/gitlab/metrics.rb | 84 +
lib/gitlab/metrics/delta.rb | 32 +
lib/gitlab/metrics/instrumentation.rb | 148 +
lib/gitlab/metrics/metric.rb | 28 +
lib/gitlab/metrics/rack_middleware.rb | 47 +
lib/gitlab/metrics/sampler.rb | 107 +
lib/gitlab/metrics/sidekiq_middleware.rb | 18 +
lib/gitlab/metrics/subscribers/action_view.rb | 46 +
lib/gitlab/metrics/subscribers/active_record.rb | 22 +
lib/gitlab/metrics/system.rb | 35 +
lib/gitlab/metrics/transaction.rb | 103 +
lib/gitlab/o_auth/session.rb | 17 +
lib/gitlab/o_auth/user.rb | 2 +-
lib/gitlab/recaptcha.rb | 14 +
lib/gitlab/reference_extractor.rb | 21 +-
lib/gitlab/visibility_level.rb | 9 +
lib/support/init.d/gitlab | 10 +-
lib/support/init.d/gitlab.default.example | 4 +-
lib/tasks/gitlab/check.rake | 2 +-
lib/tasks/gitlab/task_helpers.rake | 2 +
lib/version_check.rb | 2 +-
spec/controllers/abuse_reports_controller_spec.rb | 80 +-
.../projects/find_file_controller_spec.rb | 66 +
spec/controllers/projects/tree_controller_spec.rb | 8 +-
spec/factories/merge_requests.rb | 41 +-
spec/factories/projects.rb | 7 +
spec/features/admin/admin_builds_spec.rb | 119 +-
spec/features/admin/admin_runners_spec.rb | 2 +-
spec/features/builds_spec.rb | 23 +-
spec/features/ci_lint_spec.rb | 47 +
spec/features/issues_spec.rb | 12 +-
spec/features/lint_spec.rb | 28 -
spec/features/login_spec.rb | 52 +
spec/features/markdown_spec.rb | 1 +
spec/features/projects_spec.rb | 16 +
spec/finders/groups_finder_spec.rb | 48 -
spec/finders/joined_groups_finder_spec.rb | 49 -
spec/fixtures/markdown.md.erb | 7 +
spec/helpers/application_helper_spec.rb | 12 +-
spec/helpers/issues_helper_spec.rb | 19 +-
spec/helpers/page_layout_helper_spec.rb | 101 +
spec/helpers/projects_helper_spec.rb | 10 +
spec/helpers/search_helper_spec.rb | 2 +-
spec/javascripts/fixtures/issues_show.html.haml | 12 +-
spec/javascripts/fixtures/new_branch.html.haml | 4 +
spec/javascripts/fixtures/zen_mode.html.haml | 9 +-
spec/javascripts/issue_spec.js.coffee | 86 +
spec/javascripts/new_branch_spec.js.coffee | 160 +
spec/javascripts/zen_mode_spec.js.coffee | 26 +-
.../filter/milestone_reference_filter_spec.rb | 75 +
.../lib/banzai/filter/relative_link_filter_spec.rb | 8 +
spec/lib/banzai/filter/task_list_filter_spec.rb | 6 +
.../banzai/filter/user_reference_filter_spec.rb | 19 +-
spec/lib/banzai/querying_spec.rb | 13 +
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 6 +-
spec/lib/gitlab/build_data_builder_spec.rb | 1 +
spec/lib/gitlab/email/receiver_spec.rb | 11 +-
.../gitlab/github_import/comment_formatter_spec.rb | 80 +
.../gitlab/github_import/issue_formatter_spec.rb | 139 +
.../github_import/pull_request_formatter_spec.rb | 184 +
spec/lib/gitlab/ldap/user_spec.rb | 15 +
spec/lib/gitlab/metrics/delta_spec.rb | 16 +
spec/lib/gitlab/metrics/instrumentation_spec.rb | 240 +
spec/lib/gitlab/metrics/metric_spec.rb | 51 +
spec/lib/gitlab/metrics/rack_middleware_spec.rb | 63 +
spec/lib/gitlab/metrics/sampler_spec.rb | 119 +
spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb | 19 +
.../gitlab/metrics/subscribers/action_view_spec.rb | 33 +
.../metrics/subscribers/active_record_spec.rb | 35 +
spec/lib/gitlab/metrics/system_spec.rb | 29 +
spec/lib/gitlab/metrics/transaction_spec.rb | 138 +
spec/lib/gitlab/metrics_spec.rb | 63 +
spec/mailers/abuse_report_mailer_spec.rb | 38 +
spec/models/abuse_report_spec.rb | 33 +
spec/models/application_setting_spec.rb | 64 +-
spec/models/build_spec.rb | 70 +
spec/models/ci/build_spec.rb | 22 +
spec/models/ci/commit_spec.rb | 2 +-
spec/models/ci/runner_project_spec.rb | 11 +-
spec/models/ci/trigger_spec.rb | 13 +-
spec/models/ci/variable_spec.rb | 3 +-
spec/models/commit_status_spec.rb | 1 +
spec/models/concerns/issuable_spec.rb | 32 +
spec/models/concerns/mentionable_spec.rb | 4 +
spec/models/concerns/token_authenticatable_spec.rb | 23 +-
spec/models/external_wiki_service_spec.rb | 1 +
spec/models/generic_commit_status_spec.rb | 1 +
spec/models/global_milestone_spec.rb | 10 +
spec/models/group_spec.rb | 28 -
spec/models/hooks/web_hook_spec.rb | 12 +
spec/models/merge_request_spec.rb | 41 +-
spec/models/namespace_spec.rb | 1 -
spec/models/note_spec.rb | 30 +-
spec/models/project_services/asana_service_spec.rb | 77 +-
.../project_services/builds_email_service_spec.rb | 23 +
spec/models/project_spec.rb | 31 +
spec/models/service_spec.rb | 1 +
spec/models/user_spec.rb | 115 +-
spec/requests/api/branches_spec.rb | 2 +-
spec/requests/api/projects_spec.rb | 36 +
spec/requests/api/tags_spec.rb | 21 +
spec/requests/api/users_spec.rb | 7 +
spec/requests/ci/api/runners_spec.rb | 1 -
spec/routing/project_routing_spec.rb | 13 +
spec/services/notification_service_spec.rb | 18 +
spec/services/projects/download_service_spec.rb | 24 +-
spec/services/projects/update_service_spec.rb | 39 +
spec/services/system_hooks_service_spec.rb | 47 +-
spec/services/system_note_service_spec.rb | 2 +-
spec/support/markdown_feature.rb | 8 +
spec/support/matchers/markdown_matchers.rb | 9 +
vendor/assets/javascripts/fuzzaldrin-plus.min.js | 1 +
vendor/assets/javascripts/jquery.blockUI.js | 590 -
590 files changed, 24432 insertions(+), 3433 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