[DRE-commits] [gitlab] 02/06: Merge tag 'upstream/8.13.6+dfsg1'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Thu Nov 24 10:46:41 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 3814882c6d215eca172090379afa45c19df94e39
Merge: 8c772dd 819c14e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Nov 24 13:43:26 2016 +0530
Merge tag 'upstream/8.13.6+dfsg1'
Upstream version 8.13.6+dfsg1
# gpg: Signature made Thursday 24 November 2016 01:43:17 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.md | 38 +++++
Gemfile | 2 +-
Gemfile.lock | 6 +-
VERSION | 2 +-
app/assets/javascripts/application.js | 25 ++-
app/assets/javascripts/merge_request_tabs.js | 2 +-
.../admin/application_settings_controller.rb | 2 +-
app/controllers/application_controller.rb | 3 +-
app/controllers/jwt_controller.rb | 4 +-
app/controllers/projects/commits_controller.rb | 9 +-
.../projects/git_http_client_controller.rb | 8 +-
app/controllers/projects/git_http_controller.rb | 6 +-
app/controllers/projects/group_links_controller.rb | 2 +-
app/controllers/projects/labels_controller.rb | 2 +-
app/controllers/projects/lfs_api_controller.rb | 4 -
.../projects/merge_requests_controller.rb | 15 +-
app/controllers/projects/tags_controller.rb | 2 +-
app/controllers/projects_controller.rb | 3 +-
app/controllers/users_controller.rb | 3 +-
app/finders/issuable_finder.rb | 37 ++---
app/finders/labels_finder.rb | 47 +++---
app/helpers/application_settings_helper.rb | 4 +-
app/helpers/ci_status_helper.rb | 14 +-
app/helpers/commits_helper.rb | 8 +-
app/helpers/events_helper.rb | 4 +-
app/helpers/lfs_helper.rb | 8 +-
app/helpers/projects_helper.rb | 6 +-
app/models/application_setting.rb | 35 ++++-
app/models/commit.rb | 15 +-
app/models/concerns/issuable.rb | 6 +-
.../concerns/project_features_compatibility.rb | 2 +-
app/models/event.rb | 9 +-
app/models/group_label.rb | 4 +
app/models/guest.rb | 7 +
app/models/issue.rb | 50 +++---
app/models/label.rb | 30 ++--
app/models/merge_request.rb | 4 +-
app/models/project.rb | 47 +++++-
app/models/project_feature.rb | 14 +-
app/models/project_label.rb | 4 +
app/models/repository.rb | 24 +--
app/policies/issue_policy.rb | 4 +
app/policies/project_policy.rb | 12 +-
.../container_registry_authentication_service.rb | 18 ++-
app/services/delete_branch_service.rb | 2 +-
app/services/delete_tag_service.rb | 2 +-
app/services/git_tag_push_service.rb | 4 +-
.../admin/application_settings/_form.html.haml | 4 +-
app/views/devise/shared/_tabs_ldap.html.haml | 3 +
app/views/groups/labels/index.html.haml | 2 +-
app/views/projects/_last_commit.html.haml | 10 +-
app/views/projects/blob/_blob.html.haml | 2 +-
app/views/projects/branches/_branch.html.haml | 2 +-
app/views/projects/commits/_commit.html.haml | 11 +-
app/views/projects/commits/_commit_list.html.haml | 2 +-
app/views/projects/commits/_commits.html.haml | 6 +-
app/views/projects/commits/show.html.haml | 2 +-
.../projects/issues/_related_branches.html.haml | 2 +-
app/views/projects/labels/index.html.haml | 4 +-
.../projects/merge_requests/branch_from.html.haml | 3 +-
.../projects/merge_requests/branch_to.html.haml | 3 +-
.../merge_requests/show/_commits.html.haml | 2 +-
app/views/projects/new.html.haml | 3 +-
app/views/projects/show.html.haml | 2 +-
app/views/projects/tags/_tag.html.haml | 2 +-
app/views/search/results/_commit.html.haml | 2 +-
app/views/shared/_label.html.haml | 13 +-
app/views/shared/issuable/_form.html.haml | 1 +
.../shared/issuable/_milestone_dropdown.html.haml | 4 +-
...61103171205_rename_repository_storage_column.rb | 29 ++++
db/schema.rb | 4 +-
.../img/repository_storages_admin_ui.png | Bin 17081 -> 54043 bytes
doc/administration/repository_storages.md | 3 +
doc/api/settings.md | 4 +-
doc/development/what_requires_downtime.md | 6 +
lib/api/entities.rb | 5 +-
lib/api/helpers.rb | 10 +-
lib/api/labels.rb | 6 +-
lib/api/settings.rb | 4 +-
lib/banzai/filter/autolink_filter.rb | 38 +++--
lib/banzai/reference_parser/base_parser.rb | 16 +-
lib/banzai/reference_parser/commit_parser.rb | 6 +
lib/banzai/reference_parser/commit_range_parser.rb | 6 +
.../reference_parser/external_issue_parser.rb | 6 +
lib/banzai/reference_parser/label_parser.rb | 6 +
.../reference_parser/merge_request_parser.rb | 6 +
lib/banzai/reference_parser/milestone_parser.rb | 6 +
lib/banzai/reference_parser/snippet_parser.rb | 6 +
lib/banzai/reference_parser/user_parser.rb | 34 +++-
lib/banzai/renderer.rb | 6 +-
lib/gitlab/contributions_calendar.rb | 74 ++++++---
lib/gitlab/data_builder/push.rb | 2 +-
lib/gitlab/git_access.rb | 91 +++++++----
lib/gitlab/o_auth/user.rb | 2 +
lib/gitlab/utils.rb | 8 +
.../projects/merge_requests_controller_spec.rb | 25 +++
spec/factories/projects.rb | 10 +-
spec/features/commits_spec.rb | 23 ++-
spec/features/groups/issues_spec.rb | 8 +
spec/features/groups/merge_requests_spec.rb | 8 +
spec/features/issues/filter_by_milestone_spec.rb | 5 +
spec/features/issues/new_branch_button_spec.rb | 1 +
spec/features/merge_requests/edit_mr_spec.rb | 14 +-
spec/features/projects/features_visibility_spec.rb | 16 ++
spec/features/projects/new_project_spec.rb | 19 +++
spec/features/projects/ref_switcher_spec.rb | 14 +-
.../wiki/user_views_wiki_in_project_page_spec.rb | 44 ++++++
spec/finders/branches_finder_spec.rb | 2 +-
spec/finders/labels_finder_spec.rb | 15 ++
spec/finders/tags_finder_spec.rb | 2 +-
spec/lib/banzai/filter/autolink_filter_spec.rb | 22 +++
spec/lib/banzai/filter/redactor_filter_spec.rb | 42 +++--
.../banzai/reference_parser/base_parser_spec.rb | 35 +----
.../banzai/reference_parser/commit_parser_spec.rb | 8 +
.../reference_parser/commit_range_parser_spec.rb | 8 +
.../reference_parser/external_issue_parser_spec.rb | 8 +
.../banzai/reference_parser/issue_parser_spec.rb | 10 +-
.../banzai/reference_parser/label_parser_spec.rb | 8 +
.../reference_parser/merge_request_parser_spec.rb | 13 ++
.../reference_parser/milestone_parser_spec.rb | 8 +
.../banzai/reference_parser/snippet_parser_spec.rb | 8 +
.../banzai/reference_parser/user_parser_spec.rb | 2 +
spec/lib/gitlab/closing_issue_extractor_spec.rb | 3 +-
spec/lib/gitlab/contributions_calendar_spec.rb | 104 +++++++++++++
spec/lib/gitlab/gfm/reference_rewriter_spec.rb | 2 +-
spec/lib/gitlab/git_access_spec.rb | 33 ++++
spec/lib/gitlab/git_access_wiki_spec.rb | 2 +-
spec/lib/gitlab/o_auth/user_spec.rb | 23 ++-
spec/lib/gitlab/reference_extractor_spec.rb | 3 +-
spec/lib/gitlab/utils_spec.rb | 35 +++++
spec/models/application_setting_spec.rb | 56 ++++++-
spec/models/commit_spec.rb | 51 +++++-
spec/models/concerns/issuable_spec.rb | 5 +
.../project_features_compatibility_spec.rb | 14 ++
spec/models/event_spec.rb | 32 +++-
spec/models/guest_spec.rb | 47 ++++++
spec/models/issue_spec.rb | 100 +++++++-----
spec/models/project_spec.rb | 21 +--
spec/models/repository_spec.rb | 14 +-
spec/policies/project_policy_spec.rb | 14 ++
spec/requests/api/api_helpers_spec.rb | 30 ----
spec/requests/api/labels_spec.rb | 15 +-
spec/requests/api/settings_spec.rb | 1 +
spec/requests/git_http_spec.rb | 32 ++++
spec/requests/jwt_controller_spec.rb | 18 ++-
spec/requests/lfs_http_spec.rb | 12 +-
...ntainer_registry_authentication_service_spec.rb | 28 +++-
spec/services/git_tag_push_service_spec.rb | 173 +++++++++++++++------
spec/services/projects/create_service_spec.rb | 2 +-
spec/support/cycle_analytics_helpers.rb | 3 +-
..._features_apply_to_issuables_shared_examples.rb | 56 +++++++
spec/support/reference_parser_shared_examples.rb | 43 +++++
.../issues/_related_branches.html.haml_spec.rb | 2 +-
153 files changed, 1827 insertions(+), 553 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