[DRE-commits] [gitlab] 01/01: Merge tag 'upstream/8.5.8+dfsg'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sat Apr 2 16:23:33 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 4502604cf39d884ac4e3e3ec301f625008d1d03f
Merge: 133e422 c15382a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sat Apr 2 18:10:49 2016 +0530
Merge tag 'upstream/8.5.8+dfsg'
Upstream version 8.5.8+dfsg
# gpg: Signature made Saturday 02 April 2016 06:10:41 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>"
.gitignore | 1 +
.gitlab-ci.yml | 156 +-
.ruby-version | 2 +-
CHANGELOG | 164 +-
CONTRIBUTING.md | 161 +-
GITLAB_WORKHORSE_VERSION | 2 +-
Gemfile | 29 +-
Gemfile.lock | 115 +-
README.md | 2 +-
Rakefile | 3 +
VERSION | 2 +-
app/assets/images/emoji.png | Bin 832902 -> 263533 bytes
app/assets/images/emoji at 2x.png | Bin 0 -> 690504 bytes
app/assets/javascripts/admin.js.coffee | 13 -
app/assets/javascripts/api.js.coffee | 3 +-
app/assets/javascripts/application.js.coffee | 105 +-
app/assets/javascripts/awards_handler.coffee | 4 +-
app/assets/javascripts/broadcast_message.js.coffee | 22 +
app/assets/javascripts/dashboard.js.coffee | 34 +-
app/assets/javascripts/dispatcher.js.coffee | 5 +-
app/assets/javascripts/dropzone_input.js.coffee | 4 +-
app/assets/javascripts/issuable_context.js.coffee | 16 +-
app/assets/javascripts/issue.js.coffee | 1 +
app/assets/javascripts/logo.js.coffee | 6 +
.../javascripts/merge_request_tabs.js.coffee | 8 +
app/assets/javascripts/milestone.js.coffee | 22 +
app/assets/javascripts/notes.js.coffee | 91 +-
app/assets/javascripts/project.js.coffee | 16 +
app/assets/javascripts/project_select.js.coffee | 3 +-
app/assets/javascripts/projects_list.js.coffee | 40 +-
app/assets/javascripts/shortcuts.js.coffee | 4 +-
app/assets/javascripts/shortcuts_issuable.coffee | 23 +-
app/assets/javascripts/sidebar.js.coffee | 6 +
app/assets/javascripts/wikis.js.coffee | 3 +-
app/assets/stylesheets/framework/avatar.scss | 4 +-
app/assets/stylesheets/framework/blocks.scss | 6 +-
app/assets/stylesheets/framework/buttons.scss | 10 +-
app/assets/stylesheets/framework/common.scss | 4 +-
app/assets/stylesheets/framework/files.scss | 28 +-
app/assets/stylesheets/framework/forms.scss | 38 +-
app/assets/stylesheets/framework/gitlab-theme.scss | 2 +-
app/assets/stylesheets/framework/header.scss | 31 +-
app/assets/stylesheets/framework/issue_box.scss | 2 +-
app/assets/stylesheets/framework/jquery.scss | 15 +-
app/assets/stylesheets/framework/lists.scss | 3 +-
app/assets/stylesheets/framework/mobile.scss | 2 +-
app/assets/stylesheets/framework/nav.scss | 99 +
app/assets/stylesheets/framework/pagination.scss | 28 +-
app/assets/stylesheets/framework/panels.scss | 12 +-
app/assets/stylesheets/framework/sidebar.scss | 51 +-
app/assets/stylesheets/framework/timeline.scss | 4 +-
app/assets/stylesheets/framework/tw_bootstrap.scss | 13 -
.../framework/tw_bootstrap_variables.scss | 28 +-
app/assets/stylesheets/framework/typography.scss | 2 +-
app/assets/stylesheets/framework/variables.scss | 24 +-
app/assets/stylesheets/pages/admin.scss | 10 +
app/assets/stylesheets/pages/appearances.scss | 11 +
app/assets/stylesheets/pages/dashboard.scss | 4 -
app/assets/stylesheets/pages/detail_page.scss | 8 +
app/assets/stylesheets/pages/diff.scss | 1 +
app/assets/stylesheets/pages/emojis.scss | 3002 +--
app/assets/stylesheets/pages/events.scss | 9 +-
app/assets/stylesheets/pages/explore.scss | 8 -
app/assets/stylesheets/pages/groups.scss | 28 +
app/assets/stylesheets/pages/issuable.scss | 147 +-
app/assets/stylesheets/pages/issues.scss | 11 +-
app/assets/stylesheets/pages/labels.scss | 2 +-
app/assets/stylesheets/pages/merge_requests.scss | 36 +
app/assets/stylesheets/pages/milestone.scss | 57 +
app/assets/stylesheets/pages/projects.scss | 96 +-
app/assets/stylesheets/pages/todos.scss | 124 +
app/assets/stylesheets/pages/tree.scss | 2 +-
app/assets/stylesheets/pages/wiki.scss | 5 -
app/controllers/admin/appearances_controller.rb | 57 +
.../admin/application_settings_controller.rb | 5 +-
.../admin/broadcast_messages_controller.rb | 6 +-
app/controllers/admin/labels_controller.rb | 2 +-
app/controllers/admin/spam_logs_controller.rb | 17 +
app/controllers/application_controller.rb | 41 +-
app/controllers/ci/application_controller.rb | 47 -
app/controllers/ci/projects_controller.rb | 13 +-
app/controllers/concerns/creates_commit.rb | 53 +-
app/controllers/concerns/issues_action.rb | 2 +
app/controllers/concerns/merge_requests_action.rb | 2 +
app/controllers/dashboard/projects_controller.rb | 29 +-
app/controllers/dashboard/todos_controller.rb | 35 +
app/controllers/dashboard_controller.rb | 6 +-
app/controllers/explore/projects_controller.rb | 42 +-
app/controllers/groups_controller.rb | 34 +-
app/controllers/omniauth_callbacks_controller.rb | 63 +-
.../profiles/two_factor_auths_controller.rb | 12 +-
app/controllers/projects/application_controller.rb | 5 +
app/controllers/projects/artifacts_controller.rb | 12 +-
app/controllers/projects/avatars_controller.rb | 12 +-
app/controllers/projects/badges_controller.rb | 24 +
app/controllers/projects/blob_controller.rb | 2 +
app/controllers/projects/builds_controller.rb | 28 +-
app/controllers/projects/commit_controller.rb | 56 +-
app/controllers/projects/commits_controller.rb | 3 +
app/controllers/projects/compare_controller.rb | 23 +-
app/controllers/projects/forks_controller.rb | 23 +-
app/controllers/projects/imports_controller.rb | 12 +-
app/controllers/projects/issues_controller.rb | 1 +
app/controllers/projects/labels_controller.rb | 2 +-
.../projects/merge_requests_controller.rb | 6 +
app/controllers/projects/milestones_controller.rb | 12 +-
app/controllers/projects/notes_controller.rb | 24 +-
app/controllers/projects/raw_controller.rb | 15 +-
.../projects/runner_projects_controller.rb | 2 +-
app/controllers/projects/runners_controller.rb | 2 +-
app/controllers/projects/tags_controller.rb | 7 +-
app/controllers/projects/triggers_controller.rb | 2 +-
app/controllers/projects/variables_controller.rb | 2 +-
app/controllers/projects_controller.rb | 11 +-
app/controllers/registrations_controller.rb | 5 -
app/controllers/sessions_controller.rb | 2 +
app/controllers/uploads_controller.rb | 5 +-
app/controllers/users_controller.rb | 3 +-
app/finders/issuable_finder.rb | 23 +-
app/finders/todos_finder.rb | 129 +
app/helpers/appearances_helper.rb | 28 +-
app/helpers/application_helper.rb | 23 +-
app/helpers/application_settings_helper.rb | 4 +
app/helpers/auth_helper.rb | 4 +
app/helpers/blob_helper.rb | 18 +-
app/helpers/broadcast_messages_helper.rb | 6 +-
app/helpers/commits_helper.rb | 33 +-
app/helpers/diff_helper.rb | 15 +-
app/helpers/explore_helper.rb | 13 +-
app/helpers/gitlab_markdown_helper.rb | 15 +
app/helpers/icons_helper.rb | 2 +-
app/helpers/issuables_helper.rb | 37 +
app/helpers/issues_helper.rb | 6 +-
app/helpers/labels_helper.rb | 19 +-
app/helpers/milestones_helper.rb | 10 +
app/helpers/nav_helper.rb | 14 +
app/helpers/projects_helper.rb | 33 +-
app/helpers/search_helper.rb | 4 +-
app/helpers/snippets_helper.rb | 75 +
app/helpers/sorting_helper.rb | 18 +
app/helpers/todos_helper.rb | 87 +
app/helpers/tree_helper.rb | 3 +-
app/mailers/email_rejection_mailer.rb | 2 +-
app/mailers/emails/builds.rb | 13 +-
app/models/ability.rb | 80 +-
app/models/abuse_report.rb | 2 +-
app/models/appearance.rb | 9 +
app/models/application_setting.rb | 19 +-
app/models/broadcast_message.rb | 4 +-
app/models/ci/build.rb | 52 +-
app/models/ci/commit.rb | 6 +-
app/models/ci/runner.rb | 6 +
app/models/commit.rb | 44 +-
app/models/commit_range.rb | 4 +-
app/models/commit_status.rb | 16 +-
app/models/concerns/issuable.rb | 41 +-
app/models/email.rb | 2 +-
app/models/event.rb | 12 +-
app/models/external_issue.rb | 2 +-
app/models/group.rb | 2 +-
app/models/hooks/project_hook.rb | 4 +-
app/models/hooks/service_hook.rb | 4 +-
app/models/hooks/system_hook.rb | 4 +-
app/models/hooks/web_hook.rb | 4 +-
app/models/issue.rb | 1 +
app/models/label.rb | 19 +-
app/models/member.rb | 1 -
app/models/merge_request.rb | 25 +-
app/models/milestone.rb | 9 +-
app/models/note.rb | 7 +-
app/models/project.rb | 51 +-
app/models/project_services/pushover_service.rb | 2 +-
app/models/project_team.rb | 2 +-
app/models/project_wiki.rb | 3 +-
app/models/repository.rb | 144 +-
app/models/spam_log.rb | 10 +
app/models/spam_report.rb | 5 +
app/models/todo.rb | 53 +
app/models/tree.rb | 18 +-
app/models/user.rb | 28 +-
app/models/wiki_page.rb | 2 +-
app/services/base_service.rb | 4 +
app/services/ci/create_builds_service.rb | 1 +
app/services/ci/image_for_build_service.rb | 19 +-
app/services/commits/revert_service.rb | 58 +
app/services/create_branch_service.rb | 6 +-
app/services/create_spam_log_service.rb | 13 +
app/services/delete_branch_service.rb | 6 +-
app/services/delete_user_service.rb | 2 +-
app/services/destroy_group_service.rb | 2 +-
app/services/git_push_service.rb | 115 +-
app/services/issuable_base_service.rb | 15 +-
app/services/issues/close_service.rb | 2 +
app/services/issues/create_service.rb | 1 +
app/services/issues/update_service.rb | 12 +-
app/services/merge_requests/build_service.rb | 2 +-
app/services/merge_requests/close_service.rb | 1 +
app/services/merge_requests/create_service.rb | 3 +-
app/services/merge_requests/merge_service.rb | 3 +-
.../merge_when_build_succeeds_service.rb | 15 +-
app/services/merge_requests/update_service.rb | 12 +-
app/services/notes/create_service.rb | 21 +-
app/services/notes/post_process_service.rb | 28 +
app/services/notes/update_service.rb | 4 +
app/services/projects/destroy_service.rb | 20 +-
app/services/projects/import_service.rb | 67 +
app/services/system_note_service.rb | 19 +-
app/services/todo_service.rb | 170 +
app/validators/email_validator.rb | 15 +-
app/views/admin/appearances/_form.html.haml | 58 +
app/views/admin/appearances/preview.html.haml | 29 +
app/views/admin/appearances/show.html.haml | 7 +
.../admin/application_settings/_form.html.haml | 61 +-
app/views/admin/applications/_form.html.haml | 2 +-
app/views/admin/broadcast_messages/_form.html.haml | 7 +-
app/views/admin/broadcast_messages/index.html.haml | 2 +-
app/views/admin/broadcast_messages/preview.js.haml | 1 +
app/views/admin/builds/_build.html.haml | 6 +-
app/views/admin/builds/index.html.haml | 13 +-
app/views/admin/dashboard/index.html.haml | 5 +
app/views/admin/deploy_keys/index.html.haml | 2 +-
app/views/admin/groups/_form.html.haml | 3 +-
app/views/admin/groups/index.html.haml | 2 +-
app/views/admin/hooks/index.html.haml | 3 +-
app/views/admin/labels/_form.html.haml | 4 +
app/views/admin/labels/_label.html.haml | 10 +-
app/views/admin/projects/index.html.haml | 6 +-
app/views/admin/spam_logs/_spam_log.html.haml | 32 +
app/views/admin/spam_logs/index.html.haml | 21 +
app/views/admin/users/index.html.haml | 2 +-
app/views/dashboard/_groups_head.html.haml | 20 +-
app/views/dashboard/_projects_head.html.haml | 12 +-
app/views/dashboard/groups/index.html.haml | 9 -
app/views/dashboard/issues.html.haml | 19 +-
app/views/dashboard/merge_requests.html.haml | 10 +-
app/views/dashboard/milestones/index.html.haml | 9 +-
app/views/dashboard/projects/_projects.html.haml | 3 +
app/views/dashboard/projects/index.atom.builder | 2 +-
app/views/dashboard/projects/index.html.haml | 2 +-
app/views/dashboard/todos/_todo.html.haml | 24 +
app/views/dashboard/todos/index.html.haml | 62 +
app/views/devise/sessions/new.html.haml | 6 +-
app/views/doorkeeper/authorizations/new.html.haml | 11 +-
app/views/events/_event.html.haml | 4 +-
app/views/explore/groups/index.html.haml | 2 +-
app/views/explore/projects/_dropdown.html.haml | 15 +-
app/views/explore/projects/_filter.html.haml | 8 -
app/views/explore/projects/_nav.html.haml | 10 +
app/views/explore/projects/_projects.html.haml | 2 +-
app/views/explore/projects/index.html.haml | 7 +-
app/views/explore/projects/starred.html.haml | 11 +-
app/views/explore/projects/trending.html.haml | 10 +-
app/views/groups/_projects.html.haml | 17 +-
app/views/groups/edit.html.haml | 1 -
.../groups/group_members/_group_member.html.haml | 3 +-
app/views/groups/group_members/index.html.haml | 3 +-
app/views/groups/issues.html.haml | 16 +-
app/views/groups/merge_requests.html.haml | 7 +-
app/views/groups/milestones/index.html.haml | 16 +-
app/views/groups/projects.html.haml | 4 +-
app/views/groups/show.atom.builder | 2 +-
app/views/groups/show.html.haml | 9 +-
app/views/help/_shortcuts.html.haml | 8 +-
app/views/help/ui.html.haml | 24 +
app/views/kaminari/gitlab/_next_page.html.haml | 8 +-
app/views/kaminari/gitlab/_paginator.html.haml | 4 +-
app/views/kaminari/gitlab/_prev_page.html.haml | 8 +-
app/views/layouts/_page.html.haml | 5 +-
app/views/layouts/_search.html.haml | 2 +-
app/views/layouts/ci/_page.html.haml | 3 +-
app/views/layouts/header/_default.html.haml | 6 +-
app/views/layouts/nav/_admin.html.haml | 19 +-
app/views/layouts/nav/_dashboard.html.haml | 18 +-
app/views/layouts/nav/_project.html.haml | 7 +
app/views/notify/_note_message.html.haml | 3 +
app/views/notify/build_fail_email.html.haml | 3 +-
app/views/notify/build_success_email.html.haml | 2 +-
app/views/notify/new_issue_email.html.haml | 3 +
app/views/notify/new_merge_request_email.html.haml | 3 +
app/views/notify/repository_push_email.html.haml | 2 +-
app/views/profiles/accounts/show.html.haml | 52 +-
app/views/profiles/applications.html.haml | 2 +-
app/views/profiles/audit_log.html.haml | 2 +-
app/views/profiles/emails/index.html.haml | 34 +-
app/views/profiles/keys/index.html.haml | 10 +-
app/views/profiles/notifications/show.html.haml | 3 -
app/views/profiles/passwords/edit.html.haml | 2 +-
app/views/profiles/preferences/show.html.haml | 3 +-
app/views/profiles/show.html.haml | 2 +-
app/views/profiles/two_factor_auths/new.html.haml | 2 +-
app/views/projects/_home_panel.html.haml | 11 +-
app/views/projects/blob/_blob.html.haml | 5 +-
app/views/projects/blob/_image.html.haml | 9 +-
app/views/projects/blob/_text.html.haml | 1 +
app/views/projects/branches/index.html.haml | 2 +-
app/views/projects/builds/index.html.haml | 18 +-
app/views/projects/builds/show.html.haml | 83 +-
app/views/projects/buttons/_dropdown.html.haml | 2 +-
app/views/projects/commit/_builds.html.haml | 2 +-
app/views/projects/commit/_commit_box.html.haml | 2 +
app/views/projects/commit/_revert.html.haml | 31 +
app/views/projects/commit/show.html.haml | 2 +
.../commit_statuses/_commit_status.html.haml | 10 +-
app/views/projects/commits/show.html.haml | 5 +-
app/views/projects/compare/_form.html.haml | 5 +-
app/views/projects/diffs/_file.html.haml | 22 +-
app/views/projects/diffs/_image.html.haml | 16 +-
app/views/projects/diffs/_text_file.html.haml | 4 +-
app/views/projects/edit.html.haml | 14 +-
app/views/projects/forks/index.html.haml | 55 +
app/views/projects/forks/new.html.haml | 2 +-
app/views/projects/issues/_issue.html.haml | 11 +
app/views/projects/issues/_issues.html.haml | 5 -
app/views/projects/issues/index.html.haml | 21 +-
app/views/projects/issues/show.html.haml | 47 +-
app/views/projects/issues/update.js.haml | 6 +-
app/views/projects/labels/_form.html.haml | 4 +
app/views/projects/labels/_label.html.haml | 3 +-
app/views/projects/labels/index.html.haml | 13 +-
.../merge_requests/_merge_request.html.haml | 13 +-
.../merge_requests/_merge_requests.html.haml | 5 -
app/views/projects/merge_requests/_show.html.haml | 11 +-
app/views/projects/merge_requests/index.html.haml | 17 +-
.../merge_requests/show/_commits.html.haml | 2 +-
.../merge_requests/show/_how_to_merge.html.haml | 4 +
.../projects/merge_requests/show/_mr_box.html.haml | 7 +-
.../merge_requests/show/_mr_title.html.haml | 7 +-
app/views/projects/merge_requests/update.js.haml | 6 +-
.../merge_requests/widget/_merged.html.haml | 14 +-
.../merge_requests/widget/_merged_buttons.haml | 11 +
app/views/projects/milestones/_issue.html.haml | 13 +-
app/views/projects/milestones/_issues.html.haml | 5 +-
.../projects/milestones/_merge_requests.html.haml | 1 -
app/views/projects/milestones/index.html.haml | 15 +-
app/views/projects/milestones/show.html.haml | 86 +-
.../notes/_diff_notes_with_reply.html.haml | 2 +-
.../_diff_notes_with_reply_parallel.html.haml | 5 +-
app/views/projects/notes/_note.html.haml | 2 +-
.../projects/notes/_notes_with_form.html.haml | 10 +
.../projects/notes/discussions/_commit.html.haml | 3 +-
.../project_members/_group_members.html.haml | 2 +-
app/views/projects/project_members/_team.html.haml | 2 +-
app/views/projects/project_members/index.html.haml | 3 +-
app/views/projects/show.atom.builder | 2 +-
app/views/projects/tags/destroy.js.haml | 3 +
app/views/projects/tree/_readme.html.haml | 2 +-
app/views/projects/tree/_tree_header.html.haml | 6 +-
app/views/projects/variables/show.html.haml | 4 +-
app/views/projects/wikis/_main_links.html.haml | 23 +-
app/views/projects/wikis/_nav.html.haml | 18 +-
app/views/projects/wikis/_new.html.haml | 13 +-
app/views/projects/wikis/edit.html.haml | 22 +-
app/views/projects/wikis/history.html.haml | 13 +-
app/views/projects/wikis/pages.html.haml | 13 +-
app/views/projects/wikis/show.html.haml | 11 +-
app/views/search/results/_snippet_blob.html.haml | 44 +-
app/views/shared/_file_highlight.html.haml | 2 +-
app/views/shared/_import_form.html.haml | 2 +-
app/views/shared/_label_row.html.haml | 4 +
app/views/shared/_logo.svg | 28 +-
app/views/shared/_milestones_filter.html.haml | 21 +-
.../shared/_new_project_item_select.html.haml | 8 +-
app/views/shared/_project_limit.html.haml | 2 +-
app/views/shared/_promo.html.haml | 6 +-
app/views/shared/_sort_dropdown.html.haml | 6 +-
app/views/shared/groups/_group.html.haml | 21 +-
app/views/shared/issuable/_filter.html.haml | 33 +-
app/views/shared/issuable/_nav.html.haml | 25 +
app/views/shared/issuable/_participants.html.haml | 9 +-
app/views/shared/issuable/_search_form.html.haml | 17 +-
app/views/shared/issuable/_sidebar.html.haml | 187 +-
app/views/shared/projects/_list.html.haml | 29 +-
app/views/shared/projects/_project.html.haml | 25 +-
app/views/sherlock/transactions/_queries.html.haml | 2 +-
app/views/users/show.atom.builder | 2 +-
app/views/votes/_votes_block.html.haml | 2 +-
app/workers/new_note_worker.rb | 12 +
app/workers/post_receive.rb | 2 +-
app/workers/project_destroy_worker.rb | 17 +
app/workers/repository_fork_worker.rb | 1 +
app/workers/repository_import_worker.rb | 47 +-
config/application.rb | 24 +-
config/database.yml.env | 12 +-
config/environments/development.rb | 3 +
config/gitlab.yml.example | 19 +-
config/initializers/1_settings.rb | 2 +-
config/initializers/2_app.rb | 4 +-
config/initializers/haml.rb | 6 +
config/initializers/monkey_patch.rb | 48 +
config/initializers/redis_config.rb | 12 +
config/initializers/relative_url.rb.sample | 10 +
config/initializers/sentry.rb | 1 +
config/initializers/smtp_settings.rb.sample | 2 +-
config/locales/en.yml | 4 +
config/routes.rb | 41 +-
config/unicorn.rb.example | 9 +-
db/fixtures/development/14_builds.rb | 39 +-
db/fixtures/production/001_admin.rb | 4 +-
db/migrate/20151201203948_raise_hook_url_limit.rb | 5 +
...31152326_add_akismet_to_application_settings.rb | 8 +
db/migrate/20160109054846_create_spam_logs.rb | 16 +
...email_author_in_body_to_application_settings.rb | 5 +
...20160122185421_add_pending_delete_to_project.rb | 5 +
..._blocking_settings_from_application_settings.rb | 6 +
...5155_remove_dot_atom_path_ending_of_projects.rb | 80 +
...55512_add_merge_commit_sha_to_merge_requests.rb | 5 +
.../20160202091601_add_erasable_to_ci_build.rb | 6 +
...642_add_allow_guest_to_access_builds_project.rb | 5 +
db/migrate/20160209130428_add_index_to_snippet.rb | 5 +
db/migrate/20160212123307_create_tasks.rb | 14 +
.../20160217100506_add_description_to_label.rb | 5 +
db/migrate/20160217174422_add_note_to_tasks.rb | 5 +
db/migrate/20160220123949_rename_tasks_to_todos.rb | 5 +
db/migrate/20160222153918_create_appearances_ce.rb | 14 +
db/migrate/20160309140734_fix_todos.rb | 16 +
db/schema.rb | 77 +-
doc/administration/environment_variables.md | 78 +-
doc/administration/housekeeping.md | 4 +-
doc/api/README.md | 298 +-
doc/api/branches.md | 108 +-
doc/api/builds.md | 166 +-
doc/api/commits.md | 265 +-
doc/api/deploy_key_multiple_projects.md | 18 +-
doc/api/deploy_keys.md | 74 +-
doc/api/groups.md | 1 +
doc/api/issues.md | 404 +-
doc/api/labels.md | 152 +-
doc/api/merge_requests.md | 240 +-
doc/api/namespaces.md | 40 +-
doc/api/projects.md | 14 +-
doc/api/runners.md | 322 +
doc/api/session.md | 42 +-
doc/api/settings.md | 98 +-
doc/api/system_hooks.md | 118 +-
doc/ci/api/commits.md | 7 +
doc/ci/api/projects.md | 2 +-
doc/ci/api/runners.md | 6 +-
doc/ci/build_artifacts/README.md | 15 +-
doc/ci/docker/using_docker_images.md | 2 +-
.../test-and-deploy-ruby-application-to-heroku.md | 6 +-
doc/ci/languages/php.md | 6 +-
doc/ci/quick_start/README.md | 23 +-
doc/ci/variables/README.md | 9 +-
doc/ci/yaml/README.md | 97 +-
doc/customization/branded_login_page.md | 19 +
.../branded_login_page/appearance.png | Bin 0 -> 365120 bytes
.../branded_login_page/custom_sign_in.png | Bin 0 -> 314111 bytes
.../branded_login_page/default_login_page.png | Bin 0 -> 292731 bytes
doc/customization/issue_closing.md | 2 +-
doc/customization/welcome_message.md | 8 +-
doc/development/ci_setup.md | 2 +-
doc/development/doc_styleguide.md | 11 +
doc/development/migration_style_guide.md | 8 +-
doc/install/installation.md | 78 +-
doc/install/redis.md | 60 +
doc/install/relative_url.md | 136 +
doc/install/requirements.md | 12 +-
doc/integration/README.md | 5 +-
doc/integration/akismet.md | 30 +
doc/integration/external-issue-tracker.md | 2 +-
doc/integration/facebook.md | 6 +-
doc/integration/github.md | 2 +-
doc/integration/gitlab.md | 2 +-
doc/integration/gmail_action_buttons_for_gitlab.md | 2 +-
doc/integration/google.md | 2 +-
doc/integration/img/akismet_settings.png | Bin 0 -> 55837 bytes
doc/integration/{ => img}/facebook_api_keys.png | Bin
.../{ => img}/facebook_app_settings.png | Bin
doc/integration/{ => img}/facebook_website_url.png | Bin
doc/integration/{ => img}/github_app.png | Bin
doc/integration/{ => img}/gitlab_app.png | Bin
.../gmail_action_buttons_for_gitlab.png} | Bin
doc/integration/{ => img}/google_app.png | Bin
.../img/oauth_provider_admin_application.png | Bin 0 -> 40579 bytes
.../img/oauth_provider_application_form.png | Bin 0 -> 27974 bytes
.../img/oauth_provider_application_id_secret.png | Bin 0 -> 33901 bytes
.../img/oauth_provider_authorized_application.png | Bin 0 -> 32225 bytes
.../img/oauth_provider_user_wide_applications.png | Bin 0 -> 40632 bytes
doc/integration/{ => img}/twitter_app_api_keys.png | Bin
doc/integration/{ => img}/twitter_app_details.png | Bin
doc/integration/jira-integration-points.png | Bin 67854 -> 0 bytes
doc/integration/jira.md | 150 +-
doc/integration/oauth_provider.md | 89 +-
.../oauth_provider/admin_application.png | Bin 55533 -> 0 bytes
.../oauth_provider/application_form.png | Bin 25075 -> 0 bytes
.../oauth_provider/authorized_application.png | Bin 17260 -> 0 bytes
.../oauth_provider/user_wide_applications.png | Bin 46238 -> 0 bytes
doc/integration/omniauth.md | 30 +-
doc/integration/saml.md | 16 +-
doc/integration/slack.md | 12 +-
doc/integration/twitter.md | 6 +-
doc/markdown/img/logo.png | Bin 0 -> 11097 bytes
doc/markdown/markdown.md | 13 +-
doc/permissions/permissions.md | 9 +
doc/profile/preferences.md | 5 +
doc/project_services/builds_emails.md | 16 +
doc/project_services/img/builds_emails_service.png | Bin 0 -> 41222 bytes
.../img/jira_add_gitlab_commit_message.png | Bin 0 -> 57136 bytes
.../img/jira_add_user_to_group.png | Bin 0 -> 59251 bytes
doc/project_services/img/jira_create_new_group.png | Bin 0 -> 41294 bytes
.../img/jira_create_new_group_name.png | Bin 0 -> 12535 bytes
doc/project_services/img/jira_create_new_user.png | Bin 0 -> 26532 bytes
doc/project_services/img/jira_group_access.png | Bin 0 -> 46028 bytes
doc/project_services/img/jira_issue_closed.png | Bin 0 -> 92601 bytes
.../img/jira_issue_reference.png | Bin
doc/project_services/img/jira_issues_workflow.png | Bin 0 -> 105237 bytes
.../img/jira_merge_request_close.png | Bin
.../img/jira_project_name.png | Bin
...jira_reference_commit_message_in_jira_issue.png | Bin 0 -> 42452 bytes
.../img/jira_service.png | Bin
.../img/jira_service_close_issue.png | Bin
.../img/jira_service_page.png | Bin
.../img/jira_submit_gitlab_merge_request.png | Bin 0 -> 63063 bytes
.../img/jira_user_management_link.png | Bin 0 -> 58211 bytes
.../img/jira_workflow_screenshot.png | Bin
doc/project_services/jira.md | 221 +
doc/project_services/project_services.md | 4 +-
doc/raketasks/backup_restore.md | 2 -
doc/security/README.md | 2 +-
.../img/two_factor_authentication_settings.png | Bin 0 -> 20399 bytes
doc/security/two_factor_authentication.md | 15 +-
doc/ssh/README.md | 21 +-
doc/update/6.x-or-7.x-to-7.14.md | 6 +
doc/update/8.4-to-8.5.md | 142 +
doc/web_hooks/web_hooks.md | 268 +-
doc/workflow/README.md | 2 +
doc/workflow/forking/fork_button.png | Bin 68271 -> 0 bytes
doc/workflow/forking/groups.png | Bin 98109 -> 0 bytes
doc/workflow/forking_workflow.md | 59 +-
doc/workflow/gitlab_flow.md | 18 +-
.../img/forking_workflow_choose_namespace.png | Bin 0 -> 70405 bytes
doc/workflow/img/forking_workflow_fork_button.png | Bin 0 -> 26438 bytes
.../img/forking_workflow_path_taken_error.png | Bin 0 -> 22380 bytes
doc/workflow/img/revert_changes_commit.png | Bin 0 -> 360098 bytes
doc/workflow/img/revert_changes_commit_modal.png | Bin 0 -> 327932 bytes
doc/workflow/img/revert_changes_mr.png | Bin 0 -> 367881 bytes
doc/workflow/img/revert_changes_mr_modal.png | Bin 0 -> 335010 bytes
doc/workflow/img/todos_icon.png | Bin 0 -> 7394 bytes
doc/workflow/img/todos_index.png | Bin 0 -> 184839 bytes
.../img/web_editor_new_branch_dropdown.png | Bin 0 -> 34233 bytes
doc/workflow/img/web_editor_new_branch_page.png | Bin 0 -> 21618 bytes
.../img/web_editor_new_directory_dialog.png | Bin 0 -> 26145 bytes
.../img/web_editor_new_directory_dropdown.png | Bin 0 -> 33714 bytes
doc/workflow/img/web_editor_new_file_dropdown.png | Bin 0 -> 34978 bytes
doc/workflow/img/web_editor_new_file_editor.png | Bin 0 -> 128658 bytes
doc/workflow/img/web_editor_new_push_widget.png | Bin 0 -> 11220 bytes
doc/workflow/img/web_editor_new_tag_dropdown.png | Bin 0 -> 33753 bytes
doc/workflow/img/web_editor_new_tag_page.png | Bin 0 -> 75536 bytes
.../img/web_editor_start_new_merge_request.png | Bin 0 -> 14352 bytes
doc/workflow/img/web_editor_upload_file_dialog.png | Bin 0 -> 46219 bytes
.../img/web_editor_upload_file_dropdown.png | Bin 0 -> 34835 bytes
.../importing/import_projects_from_github.md | 20 +-
doc/workflow/protected_branches.md | 2 +-
doc/workflow/revert_changes.md | 64 +
doc/workflow/todos.md | 73 +
doc/workflow/web_editor.md | 126 +-
doc/workflow/web_editor/edit_file.png | Bin 89039 -> 0 bytes
doc/workflow/web_editor/empty_project.png | Bin 122296 -> 0 bytes
doc/workflow/web_editor/new_file.png | Bin 85526 -> 0 bytes
doc/workflow/web_editor/show_file.png | Bin 111479 -> 0 bytes
features/admin/appearance.feature | 37 +
features/admin/broadcast_messages.feature | 6 +
features/admin/spam_logs.feature | 8 +
features/dashboard/dashboard.feature | 30 +
features/dashboard/todos.feature | 38 +
features/groups.feature | 4 +
features/login_form.feature | 5 -
features/project/badges/build.feature | 27 +
features/project/builds/artifacts.feature | 21 +-
features/project/builds/permissions.feature | 35 +
features/project/builds/summary.feature | 19 +-
features/project/commits/commits.feature | 36 +
features/project/commits/revert.feature | 28 +
features/project/fork.feature | 22 +
features/project/issues/award_emoji.feature | 14 +-
features/project/issues/issues.feature | 49 +-
features/project/merge_requests.feature | 64 +
features/project/merge_requests/revert.feature | 30 +
features/project/milestone.feature | 24 +
features/project/source/browse_files.feature | 10 +
features/steps/admin/appearance.rb | 72 +
features/steps/admin/broadcast_messages.rb | 14 +-
features/steps/admin/spam_logs.rb | 28 +
features/steps/dashboard/dashboard.rb | 1 +
features/steps/dashboard/todos.rb | 128 +
features/steps/groups.rb | 4 +
features/steps/login_form.rb | 25 -
features/steps/profile/profile.rb | 2 +-
features/steps/project/badges/build.rb | 32 +
features/steps/project/builds/artifacts.rb | 10 +
features/steps/project/builds/summary.rb | 27 +-
features/steps/project/commits/commits.rb | 57 +
features/steps/project/commits/revert.rb | 40 +
features/steps/project/fork.rb | 31 +
features/steps/project/forked_merge_requests.rb | 4 +-
features/steps/project/issues/award_emoji.rb | 32 +
features/steps/project/issues/issues.rb | 67 +
features/steps/project/merge_requests.rb | 89 +
features/steps/project/merge_requests/revert.rb | 56 +
features/steps/project/project_milestone.rb | 59 +
features/steps/project/source/browse_files.rb | 19 +-
features/steps/project/source/markdown_render.rb | 18 +-
features/steps/project/wiki.rb | 8 +-
features/steps/shared/builds.rb | 43 +-
features/steps/shared/diff_note.rb | 12 +-
features/steps/shared/issuable.rb | 53 +
features/steps/shared/note.rb | 7 +
features/steps/shared/paths.rb | 16 +
features/steps/shared/project.rb | 12 +
features/support/capybara.rb | 10 +-
fixtures/emojis/aliases.json | 138 +-
fixtures/emojis/generate_aliases.rb | 18 +
fixtures/emojis/index.json | 20127 +++++++++++++++++--
lib/api/api.rb | 1 +
lib/api/builds.rb | 73 +-
lib/api/commit_statuses.rb | 2 +-
lib/api/entities.rb | 27 +-
lib/api/files.rb | 6 +-
lib/api/helpers.rb | 24 +-
lib/api/issues.rb | 23 +-
lib/api/merge_requests.rb | 366 +-
lib/api/projects.rb | 16 +-
lib/api/repositories.rb | 4 +-
lib/api/runners.rb | 175 +
lib/api/triggers.rb | 8 +-
lib/api/variables.rb | 2 +-
lib/backup/manager.rb | 3 +
lib/banzai/filter/emoji_filter.rb | 3 +-
lib/banzai/filter/sanitization_filter.rb | 13 +-
lib/banzai/pipeline/asciidoc_pipeline.rb | 11 -
lib/banzai/pipeline/broadcast_message_pipeline.rb | 16 +
lib/banzai/pipeline/description_pipeline.rb | 13 +-
lib/ci/api/api.rb | 2 +-
lib/ci/api/builds.rb | 6 +-
lib/ci/status.rb | 4 +-
lib/dnsxl_check.rb | 105 -
lib/gitlab/akismet_helper.rb | 39 +
lib/gitlab/asciidoc.rb | 4 +-
lib/gitlab/backend/shell.rb | 4 +-
lib/gitlab/bitbucket_import/importer.rb | 49 +-
lib/gitlab/blame.rb | 1 +
lib/gitlab/current_settings.rb | 33 +-
lib/gitlab/database.rb | 34 +-
lib/gitlab/diff/highlight.rb | 17 +-
lib/gitlab/diff/inline_diff.rb | 57 +-
lib/gitlab/diff/inline_diff_marker.rb | 14 +-
lib/gitlab/exclusive_lease.rb | 41 +
lib/gitlab/git.rb | 6 +-
lib/gitlab/github_import/importer.rb | 17 +-
lib/gitlab/gitlab_import/importer.rb | 2 +-
lib/gitlab/highlight.rb | 1 +
lib/gitlab/ip_check.rb | 34 -
lib/gitlab/ldap/user.rb | 4 +
lib/gitlab/note_data_builder.rb | 11 +-
lib/gitlab/o_auth/user.rb | 13 +-
lib/gitlab/other_markup.rb | 24 +
lib/gitlab/push_data_builder.rb | 18 +-
lib/gitlab/regex.rb | 12 +-
lib/gitlab/saml/user.rb | 47 +
lib/gitlab/snippet_search_results.rb | 92 +-
lib/gitlab/user_access.rb | 2 +-
lib/gitlab/workhorse.rb | 21 +
lib/support/init.d/gitlab | 6 +-
lib/support/init.d/gitlab.default.example | 13 +-
lib/tasks/cache.rake | 19 +-
lib/tasks/gitlab/check.rake | 34 +-
scripts/ci/prepare_build.sh | 22 -
scripts/prepare_build.sh | 16 +-
.../controllers/admin/spam_logs_controller_spec.rb | 37 +
spec/controllers/ci/projects_controller_spec.rb | 53 +
spec/controllers/commit_controller_spec.rb | 49 +
spec/controllers/groups_controller_spec.rb | 23 +
.../controllers/projects/commit_controller_spec.rb | 37 +
.../projects/imports_controller_spec.rb | 12 +
.../projects/merge_requests_controller_spec.rb | 62 +-
spec/controllers/projects_controller_spec.rb | 8 +
spec/factories.rb | 1 +
spec/factories/appearances.rb | 8 +
spec/factories/ci/builds.rb | 65 +-
spec/factories/ci/runners.rb | 10 +-
spec/factories/merge_requests.rb | 1 +
spec/factories/notes.rb | 14 +
spec/factories/spam_logs.rb | 11 +
spec/factories/todos.rb | 34 +
spec/features/admin/admin_builds_spec.rb | 12 +-
spec/features/builds_spec.rb | 10 +-
spec/features/commits_spec.rb | 152 +-
spec/features/login_spec.rb | 10 +-
spec/features/notes_on_merge_requests_spec.rb | 2 +-
spec/features/projects_spec.rb | 21 +-
spec/features/runners_spec.rb | 10 +-
.../security/project/public_access_spec.rb | 54 +
spec/fixtures/logo_sample.svg | 27 +
spec/fixtures/parallel_diff_result.yml | 2 +-
spec/helpers/application_helper_spec.rb | 4 +
spec/helpers/diff_helper_spec.rb | 17 +-
spec/helpers/gitlab_markdown_helper_spec.rb | 2 +-
spec/helpers/labels_helper_spec.rb | 38 +-
spec/helpers/search_helper_spec.rb | 4 +-
spec/javascripts/fixtures/project_title.html.haml | 7 +
spec/javascripts/fixtures/projects.json | 1 +
spec/javascripts/project_title_spec.js.coffee | 46 +
.../banzai/filter/commit_reference_filter_spec.rb | 4 +-
spec/lib/banzai/filter/emoji_filter_spec.rb | 4 +-
spec/lib/banzai/filter/sanitization_filter_spec.rb | 27 +-
.../banzai/pipeline/description_pipeline_spec.rb | 37 +
spec/lib/ci/status_spec.rb | 41 +
spec/lib/dnsxl_check_spec.rb | 68 -
spec/lib/gitlab/akismet_helper_spec.rb | 35 +
spec/lib/gitlab/asciidoc_spec.rb | 16 -
spec/lib/gitlab/closing_issue_extractor_spec.rb | 11 +
spec/lib/gitlab/database_spec.rb | 52 +
spec/lib/gitlab/diff/highlight_spec.rb | 72 +-
spec/lib/gitlab/diff/inline_diff_marker_spec.rb | 26 +-
spec/lib/gitlab/diff/inline_diff_spec.rb | 17 +-
spec/lib/gitlab/exclusive_lease_spec.rb | 21 +
spec/lib/gitlab/note_data_builder_spec.rb | 42 +-
spec/lib/gitlab/o_auth/user_spec.rb | 26 +-
spec/lib/gitlab/push_data_builder_spec.rb | 27 +-
spec/lib/gitlab/regex_spec.rb | 8 +
spec/lib/gitlab/{o_auth => saml}/user_spec.rb | 147 +-
spec/mailers/emails/builds_spec.rb | 65 +
spec/mailers/emails/profile_spec.rb | 107 +
spec/mailers/notify_spec.rb | 310 +-
spec/mailers/shared/notify.rb | 117 +
spec/models/abuse_report_spec.rb | 2 +-
spec/models/appearance_spec.rb | 10 +
spec/models/application_setting_spec.rb | 12 +
spec/models/build_spec.rb | 133 +-
spec/models/ci/commit_spec.rb | 29 +
spec/models/ci/runner_spec.rb | 14 +-
spec/models/commit_spec.rb | 34 +
spec/models/concerns/case_sensitivity_spec.rb | 12 +-
spec/models/concerns/issuable_spec.rb | 27 +-
spec/models/email_spec.rb | 22 +
spec/models/event_spec.rb | 21 -
spec/models/external_issue_spec.rb | 15 +
spec/models/hooks/system_hook_spec.rb | 6 +-
spec/models/member_spec.rb | 6 +-
spec/models/merge_request_spec.rb | 57 +-
spec/models/milestone_spec.rb | 14 +
spec/models/note_spec.rb | 14 +-
spec/models/project_spec.rb | 82 +-
spec/models/project_team_spec.rb | 26 +-
spec/models/repository_spec.rb | 233 +-
spec/models/spam_log_spec.rb | 25 +
spec/models/todo_spec.rb | 69 +
spec/models/tree_spec.rb | 64 +
spec/models/user_spec.rb | 40 +-
spec/models/wiki_page_spec.rb | 32 +
spec/requests/api/builds_spec.rb | 168 +-
spec/requests/api/commit_status_spec.rb | 48 +-
spec/requests/api/issues_spec.rb | 37 +-
spec/requests/api/merge_requests_spec.rb | 100 +-
spec/requests/api/projects_spec.rb | 23 +
spec/requests/api/runners_spec.rb | 464 +
spec/requests/ci/api/builds_spec.rb | 136 +-
spec/routing/project_routing_spec.rb | 12 +-
spec/services/ci/create_builds_service_spec.rb | 28 +
spec/services/git_push_service_spec.rb | 103 +-
spec/services/issues/close_service_spec.rb | 6 +
spec/services/issues/create_service_spec.rb | 23 +-
spec/services/issues/update_service_spec.rb | 69 +-
spec/services/merge_requests/close_service_spec.rb | 5 +
.../services/merge_requests/create_service_spec.rb | 42 +
.../merge_when_build_succeeds_service_spec.rb | 66 +-
.../services/merge_requests/update_service_spec.rb | 79 +-
spec/services/notes/create_service_spec.rb | 4 +-
spec/services/notes/post_process_service_spec.rb | 27 +
spec/services/notes/update_service_spec.rb | 45 +
spec/services/projects/import_service_spec.rb | 106 +
spec/services/system_note_service_spec.rb | 15 +
spec/services/todo_service_spec.rb | 274 +
spec/support/capybara.rb | 8 +-
spec/support/email_format_shared_examples.rb | 44 +
spec/support/filter_spec_helper.rb | 4 +-
spec/support/project_hook_data_shared_example.rb | 27 +
spec/support/test_env.rb | 17 +-
.../devise/shared/_signin_box.html.haml_spec.rb | 37 +
spec/workers/repository_fork_worker_spec.rb | 12 +
spec/workers/repository_import_worker_spec.rb | 19 +
vendor/assets/javascripts/Chart.js | 3477 ++++
vendor/assets/javascripts/fuzzaldrin-plus.js | 1161 ++
vendor/assets/javascripts/g.bar.js | 674 +
vendor/assets/javascripts/g.raphael.js | 861 +
vendor/assets/javascripts/jquery.nicescroll.js | 3634 ++++
786 files changed, 45429 insertions(+), 7800 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