[DRE-commits] [gitlab] 04/07: Merge tag 'upstream/8.4.0+dfsg_rc2'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Tue Jan 19 10:54:56 UTC 2016


This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 94edbca68ba880289040175e0ccac9f524d08333
Merge: f70df3b c14cdc3
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jan 19 16:12:12 2016 +0530

    Merge tag 'upstream/8.4.0+dfsg_rc2'
    
    Upstream version 8.4.0+dfsg~rc2
    
    # gpg: Signature made Tuesday 19 January 2016 04:12:06 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>"

 CHANGELOG                                          |  20 +
 CONTRIBUTING.md                                    |   4 +-
 Procfile                                           |   4 +-
 VERSION                                            |   2 +-
 app/assets/fonts/SourceSansPro-Black.ttf.woff2     | Bin 0 -> 82052 bytes
 app/assets/fonts/SourceSansPro-BlackIt.ttf.woff2   | Bin 0 -> 34812 bytes
 app/assets/fonts/SourceSansPro-Bold.ttf.woff2      | Bin 0 -> 85604 bytes
 app/assets/fonts/SourceSansPro-BoldIt.ttf.woff2    | Bin 0 -> 35864 bytes
 .../fonts/SourceSansPro-ExtraLight.ttf.woff2       | Bin 0 -> 82808 bytes
 .../fonts/SourceSansPro-ExtraLightIt.ttf.woff2     | Bin 0 -> 34560 bytes
 app/assets/fonts/SourceSansPro-It.ttf.woff2        | Bin 0 -> 36016 bytes
 app/assets/fonts/SourceSansPro-Light.ttf.woff2     | Bin 0 -> 86336 bytes
 app/assets/fonts/SourceSansPro-LightIt.ttf.woff2   | Bin 0 -> 35952 bytes
 app/assets/fonts/SourceSansPro-Regular.ttf.woff2   | Bin 0 -> 86844 bytes
 app/assets/fonts/SourceSansPro-Semibold.ttf.woff2  | Bin 0 -> 86196 bytes
 .../fonts/SourceSansPro-SemiboldIt.ttf.woff2       | Bin 0 -> 35984 bytes
 app/assets/javascripts/activities.js.coffee        |   4 +-
 app/assets/javascripts/admin.js.coffee             |  10 +-
 app/assets/javascripts/awards_handler.coffee       |   2 +-
 .../javascripts/behaviors/autosize.js.coffee       |   4 +
 app/assets/javascripts/issue.js.coffee             |  16 +-
 app/assets/javascripts/merge_request.js.coffee     |  29 +-
 .../javascripts/merge_request_tabs.js.coffee       |   2 +-
 app/assets/javascripts/notes.js.coffee             |  15 +-
 app/assets/javascripts/wikis.js.coffee             |  25 +-
 app/assets/stylesheets/framework.scss              |   1 +
 app/assets/stylesheets/framework/blocks.scss       |  25 +-
 app/assets/stylesheets/framework/buttons.scss      |  80 ++--
 app/assets/stylesheets/framework/common.scss       |  71 +--
 app/assets/stylesheets/framework/files.scss        |   5 +-
 app/assets/stylesheets/framework/flash.scss        |   2 +
 app/assets/stylesheets/framework/fonts.scss        |  24 +-
 app/assets/stylesheets/framework/forms.scss        |   6 +-
 app/assets/stylesheets/framework/header.scss       |   1 +
 app/assets/stylesheets/framework/layout.scss       |   2 -
 app/assets/stylesheets/framework/lists.scss        |   7 +-
 .../stylesheets/framework/markdown_area.scss       |  25 +-
 app/assets/stylesheets/framework/mixins.scss       |  35 --
 app/assets/stylesheets/framework/mobile.scss       |   9 +-
 app/assets/stylesheets/framework/nav.scss          |  39 ++
 app/assets/stylesheets/framework/selects.scss      |   4 +-
 app/assets/stylesheets/framework/sidebar.scss      |   3 +-
 app/assets/stylesheets/framework/tables.scss       |   7 +-
 app/assets/stylesheets/framework/timeline.scss     |   4 +-
 app/assets/stylesheets/framework/tw_bootstrap.scss |  41 --
 .../framework/tw_bootstrap_variables.scss          |   2 +-
 app/assets/stylesheets/framework/typography.scss   |   2 +-
 app/assets/stylesheets/framework/variables.scss    |   1 +
 app/assets/stylesheets/framework/zen.scss          |   2 +-
 app/assets/stylesheets/pages/commit.scss           |   2 +
 app/assets/stylesheets/pages/detail_page.scss      |   4 +-
 app/assets/stylesheets/pages/diff.scss             |  14 +-
 app/assets/stylesheets/pages/events.scss           |   4 +-
 app/assets/stylesheets/pages/issuable.scss         |  16 +-
 app/assets/stylesheets/pages/issues.scss           |   2 +-
 app/assets/stylesheets/pages/merge_requests.scss   |   6 +-
 app/assets/stylesheets/pages/note_form.scss        |   1 +
 app/assets/stylesheets/pages/projects.scss         | 226 +++------
 app/assets/stylesheets/pages/tree.scss             |  18 +-
 app/controllers/abuse_reports_controller.rb        |   1 +
 .../admin/application_settings_controller.rb       |   1 +
 .../admin/broadcast_messages_controller.rb         |  33 +-
 app/controllers/admin/identities_controller.rb     |   2 +
 app/controllers/admin/users_controller.rb          |   4 +-
 app/controllers/application_controller.rb          |   2 +-
 app/controllers/projects/artifacts_controller.rb   |  56 +++
 app/controllers/projects/builds_controller.rb      |  31 +-
 app/controllers/projects/commit_controller.rb      |   2 +-
 app/controllers/projects/issues_controller.rb      |   4 +-
 .../projects/merge_requests_controller.rb          |   1 +
 app/controllers/projects/snippets_controller.rb    |   2 +-
 app/controllers/sent_notifications_controller.rb   |  25 +
 app/helpers/application_helper.rb                  |   6 +-
 app/helpers/broadcast_messages_helper.rb           |  30 +-
 app/helpers/button_helper.rb                       |   2 +-
 app/helpers/events_helper.rb                       |   8 +-
 app/helpers/gitlab_markdown_helper.rb              |   2 +-
 app/mailers/emails/issues.rb                       |  38 +-
 app/mailers/emails/merge_requests.rb               |  55 +--
 app/mailers/emails/notes.rb                        |  44 +-
 app/mailers/notify.rb                              |   5 +-
 app/models/ability.rb                              |   2 +-
 app/models/broadcast_message.rb                    |  18 +-
 app/models/ci/build.rb                             |  49 +-
 app/models/ci/trigger.rb                           |   4 +
 app/models/ci/variable.rb                          |   6 +-
 app/models/commit_status.rb                        |   8 +-
 app/models/concerns/issuable.rb                    |   6 +
 app/models/hooks/web_hook.rb                       |   4 +-
 app/models/identity.rb                             |   4 +
 app/models/issue.rb                                |   4 +-
 app/models/note.rb                                 |   4 +
 app/models/project.rb                              |   2 +-
 app/models/project_services/hipchat_service.rb     |   8 +-
 app/models/project_wiki.rb                         |   4 +
 app/models/sent_notification.rb                    |  12 +-
 app/models/user.rb                                 |  14 +-
 app/models/wiki_page.rb                            |   2 +-
 app/services/merge_requests/merge_service.rb       |   2 +-
 app/services/repair_ldap_blocked_user_service.rb   |  17 +
 app/uploaders/artifact_uploader.rb                 |   4 +
 app/views/abuse_reports/new.html.haml              |   2 +-
 .../admin/application_settings/_form.html.haml     |   7 +
 app/views/admin/broadcast_messages/_form.html.haml |  37 ++
 app/views/admin/broadcast_messages/edit.html.haml  |   3 +
 app/views/admin/broadcast_messages/index.html.haml |  79 ++--
 app/views/admin/builds/_build.html.haml            |   4 +-
 app/views/admin/builds/index.html.haml             |   2 +-
 app/views/admin/logs/show.html.haml                |   5 +-
 app/views/admin/users/_head.html.haml              |   3 +-
 app/views/admin/users/index.html.haml              | 190 ++++----
 app/views/dashboard/_activities.html.haml          |   4 +-
 app/views/dashboard/_activity_head.html.haml       |   2 +-
 app/views/dashboard/_groups_head.html.haml         |   2 +-
 app/views/dashboard/_projects_head.html.haml       |   2 +-
 app/views/dashboard/_snippets_head.html.haml       |   2 +-
 app/views/dashboard/milestones/show.html.haml      |   2 +-
 app/views/dashboard/snippets/index.html.haml       |  48 +-
 app/views/devise/shared/_signin_box.html.haml      |   2 +-
 app/views/groups/edit.html.haml                    |   2 +-
 .../group_members/_new_group_member.html.haml      |   2 +-
 app/views/groups/group_members/index.html.haml     |   2 +-
 app/views/groups/milestones/show.html.haml         |   2 +-
 app/views/groups/projects.html.haml                |   2 +-
 app/views/groups/show.html.haml                    |  30 +-
 app/views/help/ui.html.haml                        |  21 +-
 app/views/layouts/_broadcast.html.haml             |   5 +-
 app/views/layouts/_page.html.haml                  |   2 +-
 app/views/layouts/notify.html.haml                 |   8 +-
 app/views/profiles/accounts/show.html.haml         |   2 +-
 app/views/projects/_activity.html.haml             |   4 +-
 app/views/projects/_files.html.haml                |   2 +-
 app/views/projects/_home_panel.html.haml           |  13 +-
 app/views/projects/_md_preview.html.haml           |   2 +-
 app/views/projects/_zen.html.haml                  |   2 +-
 .../projects/artifacts/_tree_directory.html.haml   |   7 +
 app/views/projects/artifacts/_tree_file.html.haml  |  11 +
 app/views/projects/artifacts/browse.html.haml      |  24 +
 app/views/projects/blob/_blob.html.haml            |   2 +-
 app/views/projects/blob/edit.html.haml             |   2 +-
 app/views/projects/branches/_branch.html.haml      |   4 +-
 app/views/projects/builds/index.html.haml          |   2 +-
 app/views/projects/builds/show.html.haml           |  14 +-
 app/views/projects/buttons/_dropdown.html.haml     |   4 +-
 app/views/projects/commit/_ci_menu.html.haml       |   2 +-
 app/views/projects/commit/_commit_box.html.haml    |   2 +-
 app/views/projects/commit/builds.html.haml         |   3 +-
 app/views/projects/commit/show.html.haml           |   4 +-
 .../commit_statuses/_commit_status.html.haml       |   4 +-
 app/views/projects/commits/_commit.html.haml       |   2 +-
 app/views/projects/commits/_head.html.haml         |   2 +-
 app/views/projects/commits/show.html.haml          |   2 +-
 app/views/projects/diffs/_diffs.html.haml          |   2 +-
 app/views/projects/edit.html.haml                  |   2 +-
 app/views/projects/empty.html.haml                 |  71 +--
 app/views/projects/graphs/_head.html.haml          |   2 +-
 .../projects/merge_requests/_new_submit.html.haml  |   2 +-
 app/views/projects/merge_requests/_show.html.haml  |   2 +-
 app/views/projects/milestones/_milestone.html.haml |   7 +-
 app/views/projects/milestones/show.html.haml       |  14 +-
 app/views/projects/notes/_notes.html.haml          |   4 +
 .../project_members/_new_project_member.html.haml  |   2 +-
 app/views/projects/project_members/index.html.haml |   2 +-
 app/views/projects/runners/index.html.haml         |   3 +-
 app/views/projects/show.html.haml                  |  25 +-
 app/views/projects/tags/_tag.html.haml             |   2 +-
 app/views/projects/tags/show.html.haml             |   2 +-
 app/views/projects/tree/_tree_content.html.haml    |   2 +-
 app/views/projects/tree/show.html.haml             |   4 +-
 app/views/projects/wikis/_nav.html.haml            |   2 +-
 app/views/projects/wikis/_new.html.haml            |  11 +-
 app/views/projects/wikis/git_access.html.haml      |  12 +-
 app/views/search/_category.html.haml               |   2 +-
 app/views/search/_results.html.haml                |   2 +-
 app/views/search/show.html.haml                    |   4 +-
 app/views/shared/_clone_panel.html.haml            |   4 +-
 app/views/shared/_event_filter.html.haml           |   2 +-
 app/views/shared/_milestones_filter.html.haml      |   2 +-
 app/views/shared/groups/_group.html.haml           |   3 +-
 app/views/shared/issuable/_filter.html.haml        |   2 +-
 app/views/shared/issuable/_sidebar.html.haml       |   7 +-
 app/views/sherlock/queries/show.html.haml          |   2 +-
 app/views/sherlock/transactions/show.html.haml     |   2 +-
 app/views/users/show.html.haml                     | 126 ++---
 bin/background_jobs                                |   9 +-
 bin/web                                            |  11 +-
 config/environments/development.rb                 |   2 +
 config/initializers/1_settings.rb                  |   2 +-
 config/routes.rb                                   |  17 +-
 db/fixtures/development/14_builds.rb               |  79 ++++
 ...230132518_add_artifacts_metadata_to_ci_build.rb |   5 +
 ...30_remove_alert_type_from_broadcast_messages.rb |   5 +
 .../20160113111034_add_metrics_sample_interval.rb  |   6 +
 db/schema.rb                                       | 510 +++++++++++----------
 doc/README.md                                      |   2 +
 doc/api/README.md                                  |   3 +
 doc/api/build_triggers.md                          | 108 +++++
 doc/api/build_variables.md                         | 128 ++++++
 doc/api/builds.md                                  | 360 +++++++++++++++
 doc/api/projects.md                                |  17 +-
 doc/api/users.md                                   |   6 +-
 doc/ci/api/builds.md                               |  62 ++-
 doc/development/doc_styleguide.md                  | 231 ++++++++++
 doc/incoming_email/README.md                       |   3 +-
 doc/incoming_email/postfix.md                      |  15 +-
 doc/install/installation.md                        |   8 +-
 .../importing/github_importer/importer.png         | Bin 39335 -> 0 bytes
 .../importing/github_importer/new_project_page.png | Bin 46276 -> 0 bytes
 .../img/import_projects_from_github_importer.png   | Bin 0 -> 28033 bytes
 ...mport_projects_from_github_new_project_page.png | Bin 0 -> 17225 bytes
 .../importing/import_projects_from_github.md       |  46 +-
 doc_styleguide.md                                  |  25 +-
 features/admin/broadcast_messages.feature          |  20 +-
 features/project/builds/artifacts.feature          |  53 +++
 features/project/builds/permissions.feature        |  18 +
 features/project/builds/summary.feature            |  11 +
 features/project/issues/references.feature         |  33 ++
 features/project/merge_requests/references.feature |  31 ++
 features/project/wiki.feature                      |   5 -
 features/steps/admin/broadcast_messages.rb         |  37 +-
 features/steps/project/builds/artifacts.rb         |  76 +++
 features/steps/project/builds/permissions.rb       |   7 +
 features/steps/project/builds/summary.rb           |  14 +
 features/steps/project/issues/references.rb        |   7 +
 .../steps/project/merge_requests/references.rb     |   7 +
 features/steps/project/wiki.rb                     |  10 -
 features/steps/shared/active_tab.rb                |   4 +-
 features/steps/shared/builds.rb                    |  37 ++
 features/steps/shared/issuable.rb                  | 134 ++++++
 features/steps/shared/note.rb                      |   4 +
 features/steps/shared/project.rb                   |  57 ++-
 lib/api/api.rb                                     |   2 +
 lib/api/builds.rb                                  | 149 ++++++
 lib/api/entities.rb                                |  36 ++
 lib/api/helpers.rb                                 |  34 +-
 lib/api/notes.rb                                   |  21 +-
 lib/api/projects.rb                                |  17 +-
 lib/api/triggers.rb                                |  69 +++
 lib/api/users.rb                                   |  14 +-
 lib/api/variables.rb                               |  95 ++++
 lib/banzai/cross_project_reference.rb              |   2 -
 lib/banzai/filter.rb                               |   1 -
 lib/banzai/filter/abstract_reference_filter.rb     |   2 -
 lib/banzai/filter/autolink_filter.rb               |   1 -
 lib/banzai/filter/commit_range_reference_filter.rb |   2 -
 lib/banzai/filter/commit_reference_filter.rb       |   2 -
 lib/banzai/filter/emoji_filter.rb                  |   1 -
 .../filter/external_issue_reference_filter.rb      |   2 -
 lib/banzai/filter/external_link_filter.rb          |   1 -
 lib/banzai/filter/gollum_tags_filter.rb            | 151 ++++++
 lib/banzai/filter/issue_reference_filter.rb        |   2 -
 lib/banzai/filter/label_reference_filter.rb        |   2 -
 lib/banzai/filter/markdown_filter.rb               |   1 -
 .../filter/merge_request_reference_filter.rb       |   2 -
 lib/banzai/filter/redactor_filter.rb               |   1 -
 lib/banzai/filter/reference_filter.rb              |   5 +-
 lib/banzai/filter/reference_gatherer_filter.rb     |   1 -
 lib/banzai/filter/relative_link_filter.rb          |   1 -
 lib/banzai/filter/sanitization_filter.rb           |   1 -
 lib/banzai/filter/snippet_reference_filter.rb      |   2 -
 lib/banzai/filter/syntax_highlight_filter.rb       |   1 -
 lib/banzai/filter/table_of_contents_filter.rb      |   1 -
 lib/banzai/filter/task_list_filter.rb              |   1 -
 lib/banzai/filter/upload_link_filter.rb            |   1 -
 lib/banzai/filter/user_reference_filter.rb         |   2 -
 lib/banzai/lazy_reference.rb                       |   2 -
 lib/banzai/pipeline.rb                             |   2 -
 lib/banzai/pipeline/asciidoc_pipeline.rb           |   2 -
 lib/banzai/pipeline/atom_pipeline.rb               |   2 -
 lib/banzai/pipeline/base_pipeline.rb               |   1 -
 lib/banzai/pipeline/combined_pipeline.rb           |   2 -
 lib/banzai/pipeline/description_pipeline.rb        |   2 -
 lib/banzai/pipeline/email_pipeline.rb              |   2 -
 lib/banzai/pipeline/full_pipeline.rb               |   2 -
 lib/banzai/pipeline/gfm_pipeline.rb                |   2 -
 lib/banzai/pipeline/note_pipeline.rb               |   2 -
 lib/banzai/pipeline/plain_markdown_pipeline.rb     |   2 -
 lib/banzai/pipeline/post_process_pipeline.rb       |   2 -
 .../pipeline/reference_extraction_pipeline.rb      |   2 -
 lib/banzai/pipeline/single_line_pipeline.rb        |   2 -
 .../{asciidoc_pipeline.rb => wiki_pipeline.rb}     |   6 +-
 lib/banzai/reference_extractor.rb                  |   2 -
 lib/ci/api/builds.rb                               |  24 +-
 lib/ci/api/entities.rb                             |  17 +-
 lib/gitlab/ci/build/artifacts/metadata.rb          | 109 +++++
 lib/gitlab/ci/build/artifacts/metadata/entry.rb    | 119 +++++
 lib/gitlab/diff/parser.rb                          |   5 +-
 lib/gitlab/github_import/importer.rb               |  27 +-
 lib/gitlab/github_import/project_creator.rb        |   3 +-
 lib/gitlab/github_import/wiki_formatter.rb         |  19 +
 lib/gitlab/gitlab_import/importer.rb               |   2 +-
 lib/gitlab/ldap/access.rb                          |   6 +-
 lib/gitlab/markdown/pipeline.rb                    |   2 -
 lib/gitlab/metrics.rb                              |   3 +-
 lib/gitlab/metrics/sampler.rb                      |  30 +-
 lib/gitlab/o_auth/user.rb                          |   5 +-
 lib/gitlab/reference_extractor.rb                  |   2 -
 lib/tasks/gitlab/task_helpers.rake                 |   3 +
 .../admin/identities_controller_spec.rb            |  26 ++
 spec/controllers/admin/users_controller_spec.rb    |  35 +-
 .../sent_notification_controller_spec.rb           |  26 ++
 spec/factories.rb                                  |   7 +
 spec/factories/broadcast_messages.rb               |  18 +-
 spec/factories/ci/builds.rb                        |  11 +
 spec/factories/ci/trigger_requests.rb              |   2 +
 spec/factories/ci/variables.rb                     |  22 +
 spec/features/builds_spec.rb                       |   8 +-
 spec/features/markdown_spec.rb                     |  63 ++-
 spec/fixtures/ci_build_artifacts.zip               | Bin 0 -> 106365 bytes
 spec/fixtures/ci_build_artifacts_metadata.gz       | Bin 0 -> 415 bytes
 spec/fixtures/markdown.md.erb                      |   9 +
 spec/helpers/broadcast_messages_helper_spec.rb     |  62 ++-
 spec/helpers/gitlab_markdown_helper_spec.rb        |   5 +-
 spec/lib/banzai/filter/gollum_tags_filter_spec.rb  |  89 ++++
 .../ci/build/artifacts/metadata/entry_spec.rb      | 168 +++++++
 .../lib/gitlab/ci/build/artifacts/metadata_spec.rb |  84 ++++
 .../gitlab/github_import/wiki_formatter_spec.rb    |  22 +
 spec/lib/gitlab/ldap/access_spec.rb                |  35 +-
 spec/lib/gitlab/metrics/sampler_spec.rb            |  22 +-
 spec/mailers/notify_spec.rb                        |  34 +-
 spec/models/broadcast_message_spec.rb              |  72 ++-
 spec/models/build_spec.rb                          | 109 +++--
 spec/models/identity_spec.rb                       |  38 ++
 spec/models/note_spec.rb                           |  24 +
 spec/models/project_wiki_spec.rb                   |   7 +
 spec/models/user_spec.rb                           |  44 +-
 spec/requests/api/builds_spec.rb                   | 172 +++++++
 spec/requests/api/commit_status_spec.rb            |   6 +-
 spec/requests/api/notes_spec.rb                    |  56 +++
 spec/requests/api/triggers_spec.rb                 | 139 +++++-
 spec/requests/api/users_spec.rb                    |  23 +-
 spec/requests/api/variables_spec.rb                | 182 ++++++++
 spec/requests/ci/api/builds_spec.rb                |  58 +++
 .../repair_ldap_blocked_user_service_spec.rb       |  23 +
 spec/support/api/pagination_shared_examples.rb     |  20 +
 spec/support/gitlab_stubs/gitlab_ci.yml            |   8 +-
 spec/support/markdown_feature.rb                   |   4 +
 spec/support/matchers/markdown_matchers.rb         |  18 +
 vendor/assets/javascripts/autosize.js              | 243 ++++++++++
 vendor/assets/javascripts/fuzzaldrin-plus.min.js   |   1 -
 vendor/assets/javascripts/latinise.js              |  11 +
 341 files changed, 5853 insertions(+), 1692 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