[DRE-commits] [gitlab] 05/10: Merge tag 'upstream/8.12.3+dfsg1'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab.

commit 1fe434c71d0a7055bd62e91c23cf401bc628c03b
Merge: a267db4 4d449cf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Oct 1 15:19:13 2016 +0530

    Merge tag 'upstream/8.12.3+dfsg1'
    
    Upstream version 8.12.3+dfsg1
    
    # gpg: Signature made Saturday 01 October 2016 03:19:13 PM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 CHANGELOG                                          | 20 ++++++++++-
 GITLAB_SHELL_VERSION                               |  2 +-
 VERSION                                            |  2 +-
 app/assets/javascripts/api.js                      |  9 ++---
 app/assets/javascripts/awards_handler.js           |  2 +-
 .../boards/components/new_list_dropdown.js.es6     |  3 +-
 app/assets/javascripts/create_label.js.es6         |  9 ++---
 .../diff_notes/components/resolve_btn.js.es6       |  8 ++---
 .../components/resolve_discussion_btn.js.es6       |  6 +---
 .../javascripts/diff_notes/mixins/namespace.js.es6 |  9 -----
 .../javascripts/diff_notes/services/resolve.js.es6 | 26 +++++++--------
 app/assets/javascripts/labels_select.js            | 16 +++++++--
 app/assets/javascripts/lib/utils/url_utility.js    |  2 +-
 app/assets/javascripts/notes.js                    | 11 +++---
 app/controllers/jwt_controller.rb                  | 21 +++++++++---
 app/controllers/projects/issues_controller.rb      |  2 +-
 app/controllers/projects/labels_controller.rb      | 10 ++++--
 app/controllers/users_controller.rb                |  2 +-
 app/mailers/notify.rb                              |  2 +-
 app/models/cycle_analytics/summary.rb              | 28 +++++++++++++---
 .../custom_issue_tracker_service.rb                |  4 +++
 .../container_registry_authentication_service.rb   | 11 ++++--
 app/services/projects/create_service.rb            | 12 +++++++
 app/services/projects/fork_service.rb              |  2 ++
 app/views/ci/lints/_create.html.haml               |  3 +-
 app/views/devise/sessions/_new_ldap.html.haml      |  2 +-
 app/views/discussions/_resolve_all.html.haml       |  5 ++-
 app/views/projects/commit/_pipelines_list.haml     |  8 +----
 .../projects/merge_requests/_discussion.html.haml  |  2 +-
 .../merge_requests/show/_versions.html.haml        | 10 +++---
 app/views/projects/notes/_note.html.haml           |  8 ++---
 app/views/shared/issuable/_filter.html.haml        |  2 +-
 .../shared/issuable/_label_dropdown.html.haml      |  2 +-
 app/views/shared/issuable/_sidebar.html.haml       |  2 +-
 app/views/snippets/_snippets.html.haml             |  4 ++-
 config/application.rb                              | 15 +++++++--
 features/steps/project/fork.rb                     |  1 +
 lib/api/helpers.rb                                 |  5 ++-
 lib/api/internal.rb                                |  2 +-
 lib/gitlab/auth.rb                                 |  2 +-
 lib/gitlab/import_export/import_export.yml         |  8 +++--
 lib/gitlab/import_export/project_tree_restorer.rb  |  8 ++++-
 lib/gitlab/lfs_token.rb                            | 19 +++++------
 spec/controllers/users_controller_spec.rb          |  4 +--
 spec/features/boards/boards_spec.rb                | 31 ++++++++++++++++-
 spec/features/dashboard/snippets_spec.rb           | 15 +++++++++
 spec/features/issues_spec.rb                       | 18 ++++++++++
 spec/features/projects/snippets_spec.rb            | 14 ++++++++
 spec/features/snippets_spec.rb                     | 14 ++++++++
 spec/features/unsubscribe_links_spec.rb            |  2 +-
 spec/features/users/snippets_spec.rb               | 22 +++---------
 spec/helpers/projects_helper_spec.rb               |  2 +-
 spec/javascripts/labels_issue_sidebar_spec.js.es6  | 13 ++++----
 spec/lib/gitlab/auth_spec.rb                       |  4 +--
 spec/lib/gitlab/import_export/project.json         | 39 +++++++++++++++++++++-
 .../import_export/project_tree_restorer_spec.rb    | 12 +++++++
 .../import_export/project_tree_saver_spec.rb       |  5 +++
 spec/lib/gitlab/lfs_token_spec.rb                  |  8 ++---
 spec/mailers/shared/notify.rb                      |  3 +-
 spec/models/cycle_analytics/summary_spec.rb        |  6 ++++
 spec/models/forked_project_link_spec.rb            |  1 +
 .../custom_issue_tracker_service_spec.rb           | 16 +++++++++
 spec/requests/api/api_helpers_spec.rb              | 39 ++++++++++++++++++----
 spec/requests/api/fork_spec.rb                     |  2 +-
 spec/requests/api/internal_spec.rb                 |  4 +--
 spec/requests/jwt_controller_spec.rb               |  4 +--
 spec/requests/lfs_http_spec.rb                     | 29 +++++++++++++++-
 spec/services/projects/fork_service_spec.rb        | 25 ++++++++++++--
 spec/services/system_note_service_spec.rb          |  2 +-
 spec/support/cycle_analytics_helpers.rb            | 26 +++++++++------
 spec/support/snippets_shared_examples.rb           | 18 ++++++++++
 spec/views/ci/lints/show.html.haml_spec.rb         | 35 +++++++++++++++++++
 72 files changed, 554 insertions(+), 186 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git