[DRE-commits] [gitlab] 02/09: Merge tag 'upstream/8.13.11+dfsg'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Wed Jan 18 15:09:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository gitlab.
commit 95eb72f16eb5392f3db61f9426230f2477b5b5ea
Merge: e5c8be3 e50b3d7
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sun Jan 15 13:20:41 2017 +0530
Merge tag 'upstream/8.13.11+dfsg'
Upstream version 8.13.11+dfsg
# gpg: Signature made Sun 15 Jan 2017 01:20:41 PM IST
# gpg: using RSA key 2A7974AE2FC152D77867DA4ACE1F9C674512C22A
# 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 | 33 ++
Gemfile | 7 +-
Gemfile.lock | 20 +-
VERSION | 2 +-
app/controllers/concerns/creates_commit.rb | 6 +-
app/controllers/projects/blob_controller.rb | 20 +-
app/controllers/projects/branches_controller.rb | 2 +-
app/controllers/projects/commit_controller.rb | 16 +-
app/controllers/projects/commits_controller.rb | 2 +-
app/controllers/projects/compare_controller.rb | 2 +-
.../projects/cycle_analytics_controller.rb | 2 +-
app/controllers/projects/discussions_controller.rb | 2 +-
app/controllers/projects/notes_controller.rb | 2 +-
app/controllers/projects/todos_controller.rb | 10 +-
app/finders/issuable_finder.rb | 27 +-
app/finders/issues_finder.rb | 18 +-
app/finders/notes_finder.rb | 113 +++++--
app/helpers/commits_helper.rb | 4 +-
app/helpers/preferences_helper.rb | 6 +-
app/models/commit.rb | 41 ++-
app/models/concerns/milestoneish.rb | 12 +-
app/models/cycle_analytics.rb | 5 +-
app/models/cycle_analytics/summary.rb | 5 +-
app/models/issue.rb | 55 ---
app/models/merge_request.rb | 6 +-
app/models/note.rb | 17 -
app/models/project.rb | 4 +-
app/models/repository.rb | 7 +-
app/models/user.rb | 4 -
app/services/commits/change_service.rb | 2 +-
app/services/git_hooks_service.rb | 6 +-
app/services/issuable_base_service.rb | 8 +-
app/services/labels/find_or_create_service.rb | 7 +-
app/services/merge_requests/build_service.rb | 2 +-
app/views/layouts/nav/_project.html.haml | 4 +-
app/views/projects/blob/edit.html.haml | 2 +-
app/views/projects/commit/_change.html.haml | 2 +-
app/views/projects/diffs/_file.html.haml | 2 +-
.../merge_requests/_merge_request.html.haml | 2 +-
app/views/projects/merge_requests/_show.html.haml | 2 +-
config/application.rb | 5 +-
.../20130319214458_create_forked_project_links.rb | 2 +
.../20130506090604_create_deploy_keys_projects.rb | 2 +
db/migrate/20130617095603_create_users_groups.rb | 2 +
.../20130711063759_create_project_group_links.rb | 2 +
.../20131112114325_create_broadcast_messages.rb | 2 +
.../20140122112253_create_merge_request_diffs.rb | 2 +
db/migrate/20140209025651_create_emails.rb | 4 +-
.../20140625115202_create_users_star_projects.rb | 2 +
db/migrate/20140729134820_create_labels.rb | 2 +
db/migrate/20140729140420_create_label_links.rb | 2 +
db/migrate/20140914113604_add_members_table.rb | 2 +
.../20140914173417_remove_old_member_tables.rb | 2 +
db/migrate/20141118150935_add_audit_event.rb | 2 +
.../20141216155758_create_doorkeeper_tables.rb | 2 +
.../20150108073740_create_application_settings.rb | 2 +
.../20150313012111_create_subscriptions_table.rb | 6 +-
db/migrate/20150806104937_create_abuse_reports.rb | 2 +
db/migrate/20151103134857_create_lfs_objects.rb | 2 +
.../20151103134958_create_lfs_objects_projects.rb | 2 +
db/migrate/20151105094515_create_releases.rb | 2 +
db/migrate/20160212123307_create_tasks.rb | 2 +
db/migrate/20160416180807_add_award_emoji.rb | 2 +
doc/api/services.md | 46 +--
doc/api/users.md | 51 ++-
features/steps/shared/authentication.rb | 2 +-
lib/api/entities.rb | 6 +-
lib/api/helpers.rb | 141 ++++----
lib/api/issues.rb | 76 ++---
lib/api/merge_requests.rb | 49 ++-
lib/api/session.rb | 2 +-
lib/api/users.rb | 10 +-
lib/gitlab/project_search_results.rb | 2 +-
lib/gitlab/search_results.rb | 4 +-
lib/gitlab/sql/union.rb | 4 +-
spec/controllers/projects/blob_controller_spec.rb | 49 +++
.../projects/branches_controller_spec.rb | 18 +
spec/controllers/projects/todo_controller_spec.rb | 32 +-
spec/controllers/search_controller_spec.rb | 61 ++++
spec/factories/notes.rb | 2 +-
spec/features/projects/blobs/edit_spec.rb | 45 +++
spec/finders/issues_finder_spec.rb | 106 +++++-
spec/finders/notes_finder_spec.rb | 200 +++++++++--
spec/fixtures/api/schemas/user/login.json | 37 ++
spec/fixtures/api/schemas/user/public.json | 79 +++++
spec/helpers/preferences_helper_spec.rb | 41 +++
spec/lib/gitlab/project_search_results_spec.rb | 38 +++
spec/lib/gitlab/search_results_spec.rb | 67 ++--
spec/lib/gitlab/sql/union_spec.rb | 22 +-
spec/models/commit_range_spec.rb | 15 +-
spec/models/commit_spec.rb | 11 +-
spec/models/cycle_analytics/code_spec.rb | 2 +-
spec/models/cycle_analytics/issue_spec.rb | 2 +-
spec/models/cycle_analytics/plan_spec.rb | 2 +-
spec/models/cycle_analytics/production_spec.rb | 2 +-
spec/models/cycle_analytics/review_spec.rb | 2 +-
spec/models/cycle_analytics/staging_spec.rb | 2 +-
spec/models/cycle_analytics/summary_spec.rb | 2 +-
spec/models/cycle_analytics/test_spec.rb | 2 +-
spec/models/issue_spec.rb | 20 --
spec/models/merge_request_spec.rb | 6 +-
spec/models/milestone_spec.rb | 11 +-
spec/models/note_spec.rb | 38 ---
spec/models/project_spec.rb | 16 +-
spec/models/repository_spec.rb | 26 ++
spec/models/user_spec.rb | 11 -
spec/requests/api/api_helpers_spec.rb | 293 ----------------
spec/requests/api/helpers_spec.rb | 373 +++++++++++++++++++++
spec/requests/api/issues_spec.rb | 32 +-
spec/requests/api/merge_requests_spec.rb | 29 +-
spec/requests/api/users_spec.rb | 82 ++++-
spec/services/labels/transfer_service_spec.rb | 2 +-
spec/services/merge_requests/build_service_spec.rb | 12 +
vendor/assets/javascripts/jquery.turbolinks.js | 49 +++
114 files changed, 1906 insertions(+), 870 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