[DRE-commits] [gitlab] 01/17: Merge tag 'upstream/8.4.3+dfsg'

[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 1fa17d8af6c3486394eb73983772df749f555ac0
Merge: 8f3961c f90c99e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Feb 5 20:25:24 2016 +0530

    Merge tag 'upstream/8.4.3+dfsg'
    
    Upstream version 8.4.3+dfsg
    
    # gpg: Signature made Friday 05 February 2016 08:25:16 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>"

 .gitlab-ci.yml                                     |  11 +-
 CHANGELOG                                          |  31 ++-
 GITLAB_WORKHORSE_VERSION                           |   2 +-
 Gemfile                                            |   5 +-
 Gemfile.lock                                       |  70 +++---
 VERSION                                            |   2 +-
 .../javascripts/behaviors/autosize.js.coffee       |  20 +-
 app/assets/javascripts/blob/edit_blob.js.coffee    |   1 +
 app/assets/stylesheets/framework/common.scss       |  16 --
 app/assets/stylesheets/framework/files.scss        |  22 +-
 app/assets/stylesheets/framework/highlight.scss    |  18 +-
 .../stylesheets/framework/markdown_area.scss       |   2 +-
 app/assets/stylesheets/framework/tables.scss       |   6 +-
 app/assets/stylesheets/framework/typography.scss   |  18 +-
 app/assets/stylesheets/highlight/dark.scss         |  56 ++---
 app/assets/stylesheets/highlight/monokai.scss      |  56 ++---
 .../stylesheets/highlight/solarized_dark.scss      |  56 ++---
 .../stylesheets/highlight/solarized_light.scss     |  57 ++---
 app/assets/stylesheets/highlight/white.scss        |  62 +++++-
 app/assets/stylesheets/pages/diff.scss             |  65 +-----
 app/assets/stylesheets/pages/note_form.scss        |  14 +-
 app/assets/stylesheets/pages/notes.scss            |   4 +-
 app/assets/stylesheets/pages/tree.scss             |   2 -
 app/controllers/omniauth_callbacks_controller.rb   |  15 +-
 app/controllers/projects/blame_controller.rb       |  24 +-
 app/controllers/projects/compare_controller.rb     |   2 +-
 app/controllers/projects/imports_controller.rb     |  20 +-
 app/models/members/project_member.rb               |   6 +-
 app/models/merge_request.rb                        |   6 +-
 app/models/merge_request_diff.rb                   |  28 +--
 app/models/project.rb                              |   5 +
 app/models/repository.rb                           |   4 +-
 app/views/projects/blame/show.html.haml            |  25 +--
 app/views/projects/blob/_text.html.haml            |   8 +-
 app/views/projects/blob/diff.html.haml             |   3 +-
 app/views/projects/blob/preview.html.haml          |  12 +-
 .../commit_statuses/_commit_status.html.haml       |   2 +-
 app/views/projects/diffs/_match_line.html.haml     |   2 +-
 .../projects/diffs/_match_line_parallel.html.haml  |   8 +-
 app/views/projects/diffs/_parallel_view.html.haml  |  16 +-
 app/views/projects/diffs/_text_file.html.haml      |   6 +-
 .../projects/notes/discussions/_diff.html.haml     |  12 +-
 app/views/search/results/_merge_request.html.haml  |   2 +-
 app/views/search/results/_snippet_blob.html.haml   |  42 ++--
 app/views/shared/_file_highlight.html.haml         |   4 +-
 app/views/shared/snippets/_blob.html.haml          |   3 +-
 config/initializers/metrics.rb                     |  21 +-
 ...0160128233227_change_lfs_objects_size_column.rb |   5 +
 db/schema.rb                                       |   6 +-
 doc/install/installation.md                        |   2 +-
 doc/update/8.3-to-8.4.md                           |   4 +-
 lib/api/helpers.rb                                 |   5 +-
 lib/ci/api/builds.rb                               |   2 +-
 lib/ci/api/helpers.rb                              |  10 +-
 lib/ci/api/runners.rb                              |   1 +
 lib/gitlab/blame.rb                                |  54 +++++
 lib/gitlab/metrics/instrumentation.rb              |  22 +-
 spec/controllers/blame_controller_spec.rb          |  14 --
 .../projects/imports_controller_spec.rb            | 109 +++++++++
 spec/factories/commit_statuses.rb                  |   8 +-
 spec/features/commits_spec.rb                      | 127 ++++++-----
 spec/javascripts/behaviors/autosize_spec.js.coffee |  11 +
 spec/lib/gitlab/blame_spec.rb                      |  24 ++
 spec/lib/gitlab/metrics/instrumentation_spec.rb    |  10 +
 spec/models/build_spec.rb                          |   2 +-
 spec/models/repository_spec.rb                     |  20 ++
 spec/requests/ci/api/builds_spec.rb                |  15 ++
 spec/requests/ci/api/runners_spec.rb               |  14 ++
 spec/spec_helper.rb                                |   6 +
 vendor/assets/javascripts/jquery.ba-resize.js      | 246 +++++++++++++++++++++
 70 files changed, 1069 insertions(+), 520 deletions(-)

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