[DRE-commits] [gitlab] 01/05: Merge tag 'upstream/8.2.1'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Thu Nov 26 11:43:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository gitlab.
commit a292291723fb37b9eb220c86cf31268e95bd9dd5
Merge: 17c6c49 bd9461e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Nov 26 14:37:26 2015 +0530
Merge tag 'upstream/8.2.1'
Upstream version 8.2.1
# gpg: Signature made Thursday 26 November 2015 02:37:19 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>"
.flayignore | 1 +
.gitignore | 2 +
.gitlab-ci.yml | 15 +
CHANGELOG | 95 ++-
CONTRIBUTING.md | 9 +-
GITLAB_GIT_HTTP_SERVER_VERSION | 1 -
GITLAB_SHELL_VERSION | 2 +-
GITLAB_WORKHORSE_VERSION | 1 +
Gemfile | 27 +-
Gemfile.lock | 79 ++-
PROCESS.md | 7 +
VERSION | 2 +-
app/assets/fonts/SourceSansPro-Black.ttf | Bin 148368 -> 289364 bytes
app/assets/fonts/SourceSansPro-BlackIt.ttf | Bin 0 -> 103404 bytes
app/assets/fonts/SourceSansPro-Bold.ttf | Bin
app/assets/fonts/SourceSansPro-BoldIt.ttf | Bin 0 -> 103608 bytes
app/assets/fonts/SourceSansPro-ExtraLight.ttf | Bin 150528 -> 291652 bytes
app/assets/fonts/SourceSansPro-ExtraLightIt.ttf | Bin 0 -> 104768 bytes
app/assets/fonts/SourceSansPro-It.ttf | Bin 0 -> 104236 bytes
app/assets/fonts/SourceSansPro-Light.ttf | Bin
app/assets/fonts/SourceSansPro-LightIt.ttf | Bin 0 -> 104616 bytes
app/assets/fonts/SourceSansPro-Regular.ttf | Bin
app/assets/fonts/SourceSansPro-Semibold.ttf | Bin
app/assets/fonts/SourceSansPro-SemiboldIt.ttf | Bin 0 -> 104020 bytes
app/assets/images/auth_buttons/facebook_64.png | Bin 0 -> 2970 bytes
app/assets/javascripts/awards_handler.coffee | 91 +++
.../javascripts/blob/blob_file_dropzone.js.coffee | 17 +-
app/assets/javascripts/blob/edit_blob.js.coffee | 8 +-
app/assets/javascripts/blob/new_blob.js.coffee | 8 +-
app/assets/javascripts/calendar.js.coffee | 2 +-
app/assets/javascripts/ci/build.coffee | 2 +-
app/assets/javascripts/copy_to_clipboard.js.coffee | 32 +
app/assets/javascripts/dispatcher.js.coffee | 8 +
app/assets/javascripts/new_commit_form.js.coffee | 21 +
app/assets/javascripts/notes.js.coffee | 9 +-
.../stat_graph_contributors_util.js.coffee | 5 +-
app/assets/stylesheets/framework/blocks.scss | 54 ++
app/assets/stylesheets/framework/buttons.scss | 15 +
app/assets/stylesheets/framework/callout.scss | 6 +-
app/assets/stylesheets/framework/common.scss | 35 +
app/assets/stylesheets/framework/files.scss | 5 +-
app/assets/stylesheets/framework/header.scss | 4 +
app/assets/stylesheets/framework/layout.scss | 1 -
app/assets/stylesheets/framework/lists.scss | 4 +-
.../stylesheets/framework/markdown_area.scss | 1 +
app/assets/stylesheets/framework/mixins.scss | 10 +-
app/assets/stylesheets/framework/sidebar.scss | 3 +
app/assets/stylesheets/framework/tables.scss | 10 +-
app/assets/stylesheets/framework/timeline.scss | 2 +-
app/assets/stylesheets/framework/tw_bootstrap.scss | 6 +-
app/assets/stylesheets/framework/typography.scss | 1 -
app/assets/stylesheets/pages/ci_projects.scss | 5 -
app/assets/stylesheets/pages/commit.scss | 1 +
app/assets/stylesheets/pages/commits.scss | 9 +
app/assets/stylesheets/pages/diff.scss | 1 -
app/assets/stylesheets/pages/editor.scss | 2 +-
app/assets/stylesheets/pages/events.scss | 16 +-
app/assets/stylesheets/pages/issuable.scss | 89 +++
app/assets/stylesheets/pages/merge_requests.scss | 23 +
app/assets/stylesheets/pages/note_form.scss | 6 +-
app/assets/stylesheets/pages/profile.scss | 28 +
app/assets/stylesheets/pages/projects.scss | 72 +-
app/assets/stylesheets/pages/runners.scss | 52 +-
app/assets/stylesheets/pages/sherlock.scss | 33 +
app/assets/stylesheets/pages/snippets.scss | 60 +-
app/assets/stylesheets/pages/tree.scss | 16 +-
app/controllers/admin/application_controller.rb | 6 +
.../admin/application_settings_controller.rb | 2 +
app/controllers/admin/impersonation_controller.rb | 32 +
app/controllers/admin/users_controller.rb | 6 -
app/controllers/application_controller.rb | 23 +-
app/controllers/ci/admin/runners_controller.rb | 1 +
app/controllers/ci/application_controller.rb | 8 -
app/controllers/ci/events_controller.rb | 21 -
app/controllers/ci/lints_controller.rb | 4 +-
app/controllers/ci/projects_controller.rb | 4 -
app/controllers/ci/runner_projects_controller.rb | 2 -
.../concerns/creates_merge_request_for_commit.rb | 28 +
app/controllers/concerns/global_milestones.rb | 19 +
app/controllers/dashboard/milestones_controller.rb | 29 +-
app/controllers/dashboard_controller.rb | 5 +
app/controllers/groups/application_controller.rb | 11 +-
app/controllers/groups/avatars_controller.rb | 4 +-
app/controllers/groups/group_members_controller.rb | 35 +-
app/controllers/groups/milestones_controller.rb | 63 +-
app/controllers/groups_controller.rb | 6 +-
app/controllers/projects/application_controller.rb | 2 +-
app/controllers/projects/blob_controller.rb | 89 ++-
app/controllers/projects/builds_controller.rb | 52 +-
app/controllers/projects/ci_services_controller.rb | 8 +-
app/controllers/projects/commit_controller.rb | 47 +-
app/controllers/projects/commits_controller.rb | 2 +-
app/controllers/projects/compare_controller.rb | 7 +-
app/controllers/projects/imports_controller.rb | 4 +-
app/controllers/projects/issues_controller.rb | 6 +-
.../projects/merge_requests_controller.rb | 7 +-
app/controllers/projects/milestones_controller.rb | 6 +-
app/controllers/projects/notes_controller.rb | 29 +-
.../projects/project_members_controller.rb | 34 +-
app/controllers/projects/releases_controller.rb | 31 +
app/controllers/projects/runners_controller.rb | 9 +-
app/controllers/projects/snippets_controller.rb | 1 +
app/controllers/projects/tags_controller.rb | 20 +-
app/controllers/projects/tree_controller.rb | 13 +-
app/controllers/projects_controller.rb | 38 +-
app/controllers/search_controller.rb | 4 +-
app/controllers/sherlock/application_controller.rb | 12 +
.../sherlock/file_samples_controller.rb | 7 +
app/controllers/sherlock/queries_controller.rb | 7 +
.../sherlock/transactions_controller.rb | 19 +
app/controllers/snippets_controller.rb | 9 +-
app/controllers/users_controller.rb | 29 +-
app/finders/contributed_projects_finder.rb | 37 +
app/finders/groups_finder.rb | 68 +-
app/finders/joined_groups_finder.rb | 49 ++
app/finders/milestones_finder.rb | 12 +
app/finders/notes_finder.rb | 4 +-
app/finders/personal_projects_finder.rb | 41 ++
app/finders/projects_finder.rb | 121 ++--
app/helpers/auth_helper.rb | 2 +-
app/helpers/builds_helper.rb | 13 -
app/helpers/ci/gitlab_helper.rb | 19 -
app/helpers/ci_status_helper.rb | 11 +-
app/helpers/clipboard_helper.rb | 8 +
app/helpers/diff_helper.rb | 10 +-
app/helpers/events_helper.rb | 28 +-
app/helpers/issues_helper.rb | 29 +-
app/helpers/labels_helper.rb | 2 +-
app/helpers/merge_requests_helper.rb | 8 -
app/helpers/milestones_helper.rb | 2 +-
app/helpers/notifications_helper.rb | 38 +-
app/helpers/preferences_helper.rb | 8 +-
app/helpers/projects_helper.rb | 14 +-
app/helpers/search_helper.rb | 2 +-
app/helpers/tab_helper.rb | 18 -
app/models/ability.rb | 145 ++--
app/models/application_setting.rb | 16 +-
app/models/ci/application_setting.rb | 12 +-
app/models/ci/build.rb | 43 +-
app/models/ci/commit.rb | 35 +-
app/models/ci/event.rb | 2 +-
app/models/ci/project.rb | 29 +-
app/models/ci/project_status.rb | 4 -
app/models/ci/runner.rb | 3 +-
app/models/ci/runner_project.rb | 2 +-
app/models/ci/service.rb | 2 +-
app/models/ci/trigger.rb | 2 +-
app/models/ci/trigger_request.rb | 2 +-
app/models/ci/variable.rb | 2 +-
app/models/ci/web_hook.rb | 2 +-
app/models/commit_status.rb | 42 +-
app/models/concerns/issuable.rb | 49 +-
app/models/concerns/sortable.rb | 11 +-
app/models/event.rb | 12 +-
app/models/generic_commit_status.rb | 33 +
app/models/global_label.rb | 17 +
.../{group_milestone.rb => global_milestone.rb} | 22 +-
app/models/group.rb | 18 +-
app/models/group_label.rb | 9 -
app/models/hooks/project_hook.rb | 25 +-
app/models/hooks/service_hook.rb | 25 +-
app/models/hooks/system_hook.rb | 25 +-
app/models/hooks/web_hook.rb | 25 +-
app/models/label.rb | 1 +
app/models/lfs_object.rb | 8 +
app/models/lfs_objects_project.rb | 8 +
app/models/member.rb | 38 +-
app/models/merge_request.rb | 15 +-
app/models/merge_request_diff.rb | 16 +-
app/models/milestone.rb | 32 +
app/models/namespace.rb | 1 +
app/models/note.rb | 58 +-
app/models/project.rb | 76 +-
app/models/project_services/ci/hip_chat_message.rb | 2 +-
app/models/project_services/ci/hip_chat_service.rb | 2 +-
app/models/project_services/ci/mail_service.rb | 2 +-
app/models/project_services/ci/slack_message.rb | 2 +-
app/models/project_services/ci/slack_service.rb | 2 +-
app/models/project_services/drone_ci_service.rb | 3 +-
app/models/project_services/gitlab_ci_service.rb | 3 +-
app/models/project_wiki.rb | 10 +
app/models/release.rb | 17 +
app/models/repository.rb | 105 ++-
app/models/user.rb | 120 ++--
app/services/ci/image_for_build_service.rb | 16 +-
app/services/compare_service.rb | 4 +-
app/services/create_release_service.rb | 31 +
app/services/create_tag_service.rb | 8 +-
app/services/delete_tag_service.rb | 4 +-
app/services/files/create_dir_service.rb | 11 +
app/services/files/create_service.rb | 11 +-
app/services/git_push_service.rb | 12 -
app/services/issues/update_service.rb | 29 +-
app/services/labels/group_service.rb | 26 -
app/services/merge_requests/refresh_service.rb | 8 +-
app/services/merge_requests/update_service.rb | 47 +-
app/services/milestones/group_service.rb | 26 -
app/services/notes/create_service.rb | 17 +-
app/services/notes/update_service.rb | 2 +-
app/services/notification_service.rb | 13 +-
app/services/projects/create_service.rb | 10 +-
app/services/projects/fork_service.rb | 2 +-
app/services/system_hooks_service.rb | 72 +-
app/services/update_release_service.rb | 29 +
app/uploaders/artifact_uploader.rb | 50 ++
app/uploaders/attachment_uploader.rb | 19 +-
app/uploaders/avatar_uploader.rb | 19 +-
app/uploaders/file_uploader.rb | 19 +-
app/uploaders/lfs_object_uploader.rb | 29 +
.../{attachment_uploader.rb => uploader_helper.rb} | 11 +-
app/views/admin/abuse_reports/index.html.haml | 21 +-
.../admin/application_settings/_form.html.haml | 14 +
app/views/admin/applications/show.html.haml | 37 +-
app/views/admin/background_jobs/show.html.haml | 37 +-
app/views/admin/deploy_keys/index.html.haml | 37 +-
app/views/admin/identities/index.html.haml | 15 +-
app/views/admin/labels/_form.html.haml | 4 +-
app/views/admin/services/index.html.haml | 39 +-
app/views/admin/users/_head.html.haml | 2 +-
app/views/{ => admin}/users/_profile.html.haml | 4 +-
app/views/admin/users/show.html.haml | 2 +-
app/views/ci/admin/events/index.html.haml | 33 +-
app/views/ci/admin/projects/index.html.haml | 23 +-
app/views/ci/admin/runner_projects/index.html.haml | 2 +-
app/views/ci/admin/runners/index.html.haml | 31 +-
app/views/ci/admin/runners/show.html.haml | 34 +-
app/views/ci/events/index.html.haml | 19 -
app/views/ci/lints/_create.html.haml | 50 +-
app/views/ci/lints/show.html.haml | 16 +-
app/views/ci/notify/build_fail_email.html.haml | 8 +-
app/views/ci/notify/build_fail_email.text.erb | 2 +
app/views/ci/notify/build_success_email.html.haml | 8 +-
app/views/ci/notify/build_success_email.text.erb | 2 +
app/views/ci/user_sessions/new.html.haml | 3 +-
app/views/dashboard/groups/index.html.haml | 2 +-
app/views/dashboard/milestones/index.html.haml | 6 +-
app/views/dashboard/milestones/show.html.haml | 76 +-
app/views/dashboard/projects/index.atom.builder | 2 +-
app/views/dashboard/snippets/index.html.haml | 26 +-
app/views/doorkeeper/applications/index.html.haml | 30 +-
app/views/doorkeeper/applications/show.html.haml | 38 +-
.../authorized_applications/index.html.haml | 25 +-
app/views/explore/snippets/index.html.haml | 3 +-
app/views/groups/edit.html.haml | 9 +
.../groups/group_members/_group_member.html.haml | 6 +-
app/views/groups/group_members/index.html.haml | 15 +-
app/views/groups/milestones/_milestone.html.haml | 2 +-
app/views/groups/milestones/index.html.haml | 19 +-
app/views/groups/milestones/new.html.haml | 48 ++
app/views/groups/milestones/show.html.haml | 84 +--
app/views/groups/show.atom.builder | 2 +-
app/views/help/_shortcuts.html.haml | 8 +-
app/views/import/bitbucket/status.html.haml | 81 +--
app/views/import/fogbugz/new_user_map.html.haml | 37 +-
app/views/import/fogbugz/status.html.haml | 67 +-
app/views/import/github/status.html.haml | 67 +-
app/views/import/gitlab/status.html.haml | 67 +-
app/views/import/gitorious/status.html.haml | 67 +-
app/views/import/google_code/status.html.haml | 81 +--
app/views/layouts/_piwik.html.haml | 18 +-
app/views/layouts/_search.html.haml | 6 +-
app/views/layouts/ci/_nav_admin.html.haml | 18 +-
app/views/layouts/ci/project.html.haml | 11 -
app/views/layouts/header/_default.html.haml | 9 +
app/views/layouts/nav/_group.html.haml | 4 +-
app/views/layouts/nav/_group_settings.html.haml | 4 +-
app/views/layouts/nav/_profile.html.haml | 4 +-
app/views/layouts/nav/_project.html.haml | 10 +-
app/views/layouts/nav/_project_settings.html.haml | 11 +-
app/views/layouts/notify.html.haml | 7 +-
app/views/notify/project_was_moved_email.text.erb | 2 +-
app/views/profiles/_event_table.html.haml | 29 +-
.../profiles/notifications/_settings.html.haml | 2 +-
app/views/profiles/preferences/show.html.haml | 4 +-
app/views/projects/_activity.html.haml | 5 +-
app/views/projects/_files.html.haml | 6 +
app/views/projects/_home_panel.html.haml | 15 +-
app/views/projects/_last_commit.html.haml | 12 +
app/views/projects/_readme.html.haml | 13 +-
app/views/projects/_zen.html.haml | 9 +-
app/views/projects/activity.html.haml | 2 +
app/views/projects/blob/_actions.html.haml | 2 +-
app/views/projects/blob/_blob.html.haml | 31 +-
app/views/projects/blob/_new_dir.html.haml | 16 +-
app/views/projects/blob/_remove.html.haml | 16 +-
app/views/projects/blob/_upload.html.haml | 20 +-
app/views/projects/blob/edit.html.haml | 11 +-
app/views/projects/blob/new.html.haml | 16 +-
app/views/projects/blob/show.html.haml | 7 +-
app/views/projects/branches/_commit.html.haml | 4 +-
app/views/projects/builds/_build.html.haml | 53 --
app/views/projects/builds/_header_title.html.haml | 1 +
app/views/projects/builds/index.html.haml | 41 +-
app/views/projects/builds/show.html.haml | 44 +-
app/views/projects/buttons/_download.html.haml | 4 +
app/views/projects/buttons/_dropdown.html.haml | 8 +-
app/views/projects/buttons/_fork.html.haml | 25 +-
.../projects/buttons/_notifications.html.haml | 4 +-
app/views/projects/buttons/_star.html.haml | 14 +-
app/views/projects/ci_services/edit.html.haml | 1 +
app/views/projects/ci_services/index.html.haml | 1 +
app/views/projects/ci_settings/_form.html.haml | 7 +-
.../projects/ci_settings/_no_runners.html.haml | 2 +-
app/views/projects/ci_settings/edit.html.haml | 20 +-
app/views/projects/ci_web_hooks/index.html.haml | 24 +-
app/views/projects/commit/_ci_menu.html.haml | 6 +-
app/views/projects/commit/_commit_box.html.haml | 8 +-
app/views/projects/commit/builds.html.haml | 72 ++
app/views/projects/commit/ci.html.haml | 67 --
app/views/projects/commit/show.html.haml | 2 +-
.../commit_statuses/_commit_status.html.haml | 34 +-
app/views/projects/commits/_commit.html.haml | 6 +-
app/views/projects/commits/_head.html.haml | 2 +-
app/views/projects/commits/show.atom.builder | 2 +-
app/views/projects/diffs/_diffs.html.haml | 4 +-
app/views/projects/diffs/_file.html.haml | 3 +-
app/views/projects/edit.html.haml | 29 +-
app/views/projects/graphs/_head.html.haml | 4 +-
app/views/projects/graphs/ci.html.haml | 13 +-
app/views/projects/graphs/ci/_build_times.haml | 17 +-
app/views/projects/graphs/ci/_builds.haml | 50 +-
app/views/projects/graphs/ci/_overall.haml | 16 +-
app/views/projects/graphs/commits.html.haml | 60 +-
app/views/projects/graphs/show.html.haml | 29 +-
app/views/projects/hooks/index.html.haml | 2 +-
app/views/projects/imports/new.html.haml | 25 +-
app/views/projects/imports/show.html.haml | 2 +-
app/views/projects/issues/_discussion.html.haml | 8 +-
app/views/projects/issues/_issue.html.haml | 2 -
app/views/projects/issues/_issues.html.haml | 7 +-
app/views/projects/labels/destroy.js.haml | 2 +-
app/views/projects/labels/index.html.haml | 6 +-
.../projects/merge_requests/_discussion.html.haml | 8 +-
.../merge_requests/_merge_request.html.haml | 10 +-
.../merge_requests/_merge_requests.html.haml | 6 +-
.../projects/merge_requests/_new_compare.html.haml | 17 +-
.../merge_requests/show/_commits.html.haml | 4 +
.../projects/merge_requests/show/_diffs.html.haml | 2 +-
.../merge_requests/show/_how_to_merge.html.haml | 7 +-
.../merge_requests/widget/_heading.html.haml | 9 +-
.../merge_requests/widget/_merged.html.haml | 31 +-
.../merge_requests/widget/open/_accept.html.haml | 15 +-
.../merge_requests/widget/open/_check.html.haml | 8 +-
app/views/projects/milestones/_form.html.haml | 6 +-
app/views/projects/new.html.haml | 29 +-
app/views/projects/notes/_form.html.haml | 2 +-
app/views/projects/notes/_note.html.haml | 25 +-
.../projects/notes/_notes_with_form.html.haml | 4 +-
.../project_members/_project_member.html.haml | 11 +-
app/views/projects/project_members/_team.html.haml | 4 +-
app/views/projects/project_members/index.html.haml | 9 +-
app/views/projects/project_members/update.js.haml | 3 +-
.../protected_branches/_branches_list.html.haml | 59 +-
app/views/projects/releases/edit.html.haml | 19 +
app/views/projects/remove_fork.js.haml | 2 +
app/views/projects/runners/edit.html.haml | 2 +
app/views/projects/runners/index.html.haml | 1 +
app/views/projects/runners/show.html.haml | 122 ++--
app/views/projects/services/index.html.haml | 39 +-
app/views/projects/show.atom.builder | 2 +-
app/views/projects/show.html.haml | 17 +-
app/views/projects/snippets/_actions.html.haml | 11 +
app/views/projects/snippets/index.html.haml | 20 +-
app/views/projects/snippets/show.html.haml | 46 +-
app/views/projects/tags/_download.html.haml | 17 +
app/views/projects/tags/_tag.html.haml | 18 +-
app/views/projects/tags/destroy.js.haml | 3 -
app/views/projects/tags/new.html.haml | 20 +-
app/views/projects/tags/show.html.haml | 39 ++
app/views/projects/tree/_blob_item.html.haml | 2 +-
app/views/projects/tree/_readme.html.haml | 6 +-
app/views/projects/tree/_tree.html.haml | 73 --
app/views/projects/tree/_tree_content.html.haml | 40 ++
app/views/projects/tree/_tree_header.html.haml | 32 +
app/views/projects/tree/_tree_item.html.haml | 2 +-
app/views/projects/tree/show.html.haml | 8 +-
app/views/projects/triggers/index.html.haml | 14 +-
app/views/projects/variables/show.html.haml | 1 +
app/views/projects/wikis/_form.html.haml | 4 +-
app/views/projects/wikis/history.html.haml | 49 +-
app/views/search/_category.html.haml | 7 +
app/views/search/results/_commit.html.haml | 2 +
app/views/shared/_clone_panel.html.haml | 5 +-
.../shared/_commit_message_container.html.haml | 8 +-
app/views/shared/_import_form.html.haml | 16 +
app/views/shared/_new_commit_form.html.haml | 18 +
app/views/shared/issuable/_context.html.haml | 6 +-
app/views/shared/issuable/_filter.html.haml | 12 +-
app/views/shared/issuable/_form.html.haml | 9 +-
app/views/shared/projects/_list.html.haml | 4 +-
app/views/shared/projects/_project.html.haml | 4 +-
app/views/shared/snippets/_header.html.haml | 24 +
app/views/shared/snippets/_snippet.html.haml | 1 -
app/views/sherlock/file_samples/show.html.haml | 55 ++
app/views/sherlock/queries/_backtrace.html.haml | 27 +
app/views/sherlock/queries/_general.html.haml | 50 ++
app/views/sherlock/queries/show.html.haml | 26 +
.../sherlock/transactions/_file_samples.html.haml | 24 +
app/views/sherlock/transactions/_general.html.haml | 33 +
app/views/sherlock/transactions/_queries.html.haml | 24 +
app/views/sherlock/transactions/index.html.haml | 42 ++
app/views/sherlock/transactions/show.html.haml | 36 +
app/views/snippets/_actions.html.haml | 11 +
app/views/snippets/show.html.haml | 51 +-
app/views/users/_projects.html.haml | 13 -
app/views/users/calendar.html.haml | 6 +-
app/views/users/show.atom.builder | 2 +-
app/views/users/show.html.haml | 151 ++--
app/views/votes/_votes_block.html.haml | 42 +-
app/views/votes/_votes_inline.html.haml | 9 -
app/workers/repository_fork_worker.rb | 14 +-
app/workers/repository_import_worker.rb | 62 +-
app/workers/stuck_ci_builds_worker.rb | 21 +
config/environments/test.rb | 2 +
config/gitlab.yml.example | 48 +-
config/initializers/1_settings.rb | 39 +-
config/initializers/2_app.rb | 6 +-
config/initializers/inflections.rb | 21 -
config/initializers/rack_profiler.rb | 10 -
config/initializers/session_store.rb | 25 +-
config/initializers/sherlock.rb | 5 +
config/initializers/state_machine_patch.rb | 9 -
config/locales/sherlock.en.yml | 37 +
config/routes.rb | 44 +-
.../20151013092124_add_artifacts_file_to_builds.rb | 5 +
db/migrate/20151019111551_fix_build_tags.rb | 6 +-
.../20151019111703_fail_build_without_names.rb | 5 +-
.../20151020145526_add_services_template_index.rb | 5 +
.../20151023112551_fail_build_with_empty_name.rb | 8 +
db/migrate/20151023144219_remove_satellites.rb | 17 +
.../20151026182941_add_project_path_index.rb | 9 +
db/migrate/20151103001141_add_public_to_group.rb | 5 +
.../20151103133339_add_shared_runners_setting.rb | 5 +
db/migrate/20151103134857_create_lfs_objects.rb | 10 +
.../20151103134958_create_lfs_objects_projects.rb | 12 +
.../20151104105513_add_file_to_lfs_objects.rb | 5 +
db/migrate/20151105094515_create_releases.rb | 14 +
db/migrate/20151106000015_add_is_award_to_notes.rb | 6 +
...d_max_artifacts_size_to_application_settings.rb | 5 +
.../20151110125604_add_import_error_to_project.rb | 5 +
...0151114113410_add_index_for_lfs_oid_and_size.rb | 6 +
.../20151116144118_add_unique_for_lfs_oid_index.rb | 7 +
.../20151118162244_add_projects_public_index.rb | 5 +
db/schema.rb | 52 +-
doc/README.md | 30 +-
doc/api/README.md | 1 +
doc/api/commits.md | 10 +-
doc/api/merge_requests.md | 20 +-
doc/api/notes.md | 5 +-
doc/api/projects.md | 6 +
doc/api/repositories.md | 74 --
doc/api/repository_files.md | 3 +-
doc/api/tags.md | 131 ++++
doc/ci/api/README.md | 2 +-
doc/ci/api/projects.md | 22 +-
doc/ci/api/runners.md | 4 +-
doc/ci/docker/using_docker_build.md | 4 +-
doc/ci/docker/using_docker_images.md | 2 +-
doc/ci/examples/README.md | 6 +-
...test-and-deploy-python-application-to-heroku.md | 2 +-
.../test-and-deploy-ruby-application-to-heroku.md | 4 +-
doc/ci/examples/test-clojure-application.md | 4 +-
doc/ci/quick_start/README.md | 6 +-
doc/ci/yaml/README.md | 110 ++-
doc/customization/libravatar.md | 6 +-
doc/development/architecture.md | 2 +-
doc/development/profiling.md | 45 +-
doc/development/rake_tasks.md | 2 +-
doc/development/shared_files.md | 33 +
doc/development/shell_commands.md | 20 +-
doc/hooks/custom_hooks.md | 2 +-
doc/install/database_mysql.md | 2 +-
doc/install/installation.md | 43 +-
doc/install/requirements.md | 6 +-
doc/integration/facebook.md | 97 +++
doc/integration/facebook_api_keys.png | Bin 0 -> 125921 bytes
doc/integration/facebook_app_settings.png | Bin 0 -> 134387 bytes
doc/integration/facebook_website_url.png | Bin 0 -> 42292 bytes
doc/integration/ldap.md | 4 +-
doc/integration/omniauth.md | 5 +-
.../corporate_contributor_license_agreement.md | 2 +-
.../individual_contributor_license_agreement.md | 2 +-
doc/markdown/markdown.md | 12 +-
doc/operations/unicorn.md | 6 +-
doc/permissions/permissions.md | 4 +-
doc/raketasks/backup_restore.md | 3 +-
doc/release/monthly.md | 90 ++-
doc/release/security.md | 4 +-
doc/ssh/README.md | 9 +-
doc/update/6.x-or-7.x-to-7.14.md | 2 +-
doc/update/8.1-to-8.2.md | 189 +++++
doc/update/mysql_to_postgresql.md | 4 +
doc/update/patch_versions.md | 4 +-
doc/web_hooks/web_hooks.md | 5 +-
doc/workflow/README.md | 3 +
doc/workflow/award_emoji.png | Bin 0 -> 6620 bytes
doc/workflow/gitlab_flow.md | 23 +-
.../importing/import_projects_from_gitlab_com.md | 4 +-
doc/workflow/importing/migrating_from_svn.md | 4 +-
doc/workflow/lfs/lfs_administration.md | 41 ++
.../lfs/manage_large_binaries_with_git_lfs.md | 126 ++++
doc/workflow/merge_requests.md | 12 +
doc/workflow/merge_requests/commit_compare.png | Bin 0 -> 89631 bytes
doc/workflow/merge_requests/merge_request_diff.png | Bin 0 -> 120422 bytes
.../merge_request_diff_without_whitespace.png | Bin 0 -> 98887 bytes
doc/workflow/milestones.md | 13 +
doc/workflow/milestones/form.png | Bin 0 -> 88591 bytes
doc/workflow/milestones/group_form.png | Bin 0 -> 77087 bytes
doc/workflow/releases.md | 20 +
doc/workflow/releases/new_tag.png | Bin 0 -> 154755 bytes
doc/workflow/releases/tags.png | Bin 0 -> 165449 bytes
doc/workflow/voting_slider.png | Bin 5329 -> 0 bytes
doc_styleguide.md | 2 +
features/groups.feature | 17 +-
features/profile/profile.feature | 1 +
features/project/commits/tags.feature | 20 +-
features/project/issues/award_emoji.feature | 14 +
features/project/merge_requests.feature | 15 +
features/project/project.feature | 6 +
features/project/snippets.feature | 2 +-
features/project/source/browse_files.feature | 24 +-
features/snippets/snippets.feature | 2 +-
features/steps/abuse_reports.rb | 2 +-
features/steps/dashboard/new_project.rb | 1 -
features/steps/groups.rb | 42 +-
features/steps/profile/profile.rb | 15 +-
features/steps/project/commits/tags.rb | 36 +-
features/steps/project/graph.rb | 6 +-
features/steps/project/issues/award_emoji.rb | 41 ++
features/steps/project/merge_requests.rb | 33 +
features/steps/project/project.rb | 8 +-
features/steps/project/snippets.rb | 8 +-
features/steps/project/source/browse_files.rb | 39 +-
features/steps/shared/paths.rb | 4 +
features/steps/shared/project.rb | 7 +
features/steps/shared/project_tab.rb | 2 +-
features/steps/snippets/snippets.rb | 6 +-
features/steps/snippets/user.rb | 6 +-
lib/api/api.rb | 3 +-
lib/api/entities.rb | 58 +-
lib/api/files.rb | 4 +-
lib/api/helpers.rb | 50 +-
lib/api/projects.rb | 10 +-
lib/api/repositories.rb | 35 -
lib/api/tags.rb | 86 +++
lib/award_emoji.rb | 12 +
lib/backup/artifacts.rb | 13 +
lib/backup/builds.rb | 33 +-
lib/backup/database.rb | 54 +-
lib/backup/files.rb | 40 ++
lib/backup/lfs.rb | 13 +
lib/backup/manager.rb | 14 +-
lib/backup/repository.rb | 6 +-
lib/backup/uploads.rb | 32 +-
lib/ci/api/api.rb | 3 +-
lib/ci/api/builds.rb | 102 +++
lib/ci/api/entities.rb | 7 +
lib/ci/api/helpers.rb | 15 +-
lib/ci/charts.rb | 3 +-
lib/ci/gitlab_ci_yaml_processor.rb | 147 ++--
lib/file_streamer.rb | 16 +
lib/gitlab/backend/grack_auth.rb | 16 +-
lib/gitlab/backend/shell.rb | 7 +-
lib/gitlab/compare_result.rb | 4 +-
lib/gitlab/current_settings.rb | 4 +-
lib/gitlab/database.rb | 2 +-
lib/gitlab/force_push_check.rb | 2 +-
lib/gitlab/git_access.rb | 6 +-
lib/gitlab/git_ref_validator.rb | 2 +-
lib/gitlab/google_code_import/importer.rb | 93 +--
lib/gitlab/inline_diff.rb | 87 ++-
lib/gitlab/lfs/response.rb | 327 +++++++++
lib/gitlab/lfs/router.rb | 97 +++
lib/gitlab/markdown/reference_filter.rb | 8 +-
lib/gitlab/markdown/relative_link_filter.rb | 2 +-
lib/gitlab/markdown/sanitization_filter.rb | 19 +
lib/gitlab/o_auth/provider.rb | 9 +-
lib/gitlab/project_search_results.rb | 18 +-
lib/gitlab/push_data_builder.rb | 33 +-
lib/gitlab/regex.rb | 17 +
lib/gitlab/sherlock.rb | 19 +
lib/gitlab/sherlock/collection.rb | 49 ++
lib/gitlab/sherlock/file_sample.rb | 31 +
lib/gitlab/sherlock/line_profiler.rb | 98 +++
lib/gitlab/sherlock/line_sample.rb | 36 +
lib/gitlab/sherlock/location.rb | 26 +
lib/gitlab/sherlock/middleware.rb | 41 ++
lib/gitlab/sherlock/query.rb | 114 +++
lib/gitlab/sherlock/transaction.rb | 131 ++++
lib/gitlab/sql/union.rb | 34 +
lib/gitlab/upgrader.rb | 8 +-
lib/support/init.d/gitlab | 68 +-
lib/support/init.d/gitlab.default.example | 11 +-
lib/support/nginx/gitlab | 47 +-
lib/support/nginx/gitlab-ssl | 47 +-
lib/tasks/flay.rake | 9 +
lib/tasks/flog.rake | 25 +
lib/tasks/gitlab/backup.rake | 42 ++
lib/tasks/gitlab/check.rake | 4 +-
lib/tasks/gitlab/shell.rake | 10 +-
lib/tasks/grape.rake | 8 +
lib/tasks/spinach.rake | 6 +-
lib/uploaded_file.rb | 37 +
shared/.gitkeep | 0
shared/artifacts/.gitkeep | 0
shared/artifacts/tmp/cache/.gitkeep | 0
shared/artifacts/tmp/uploads/.gitkeep | 0
.../lib/gitlab/markdown/reference_filter_spec.rb | 41 ++
spec/benchmarks/models/milestone_spec.rb | 17 +
spec/benchmarks/models/user_spec.rb | 36 +
.../services/projects/create_service_spec.rb | 28 +
spec/controllers/admin/users_controller_spec.rb | 15 -
.../projects/compare_controller_spec.rb | 16 +
.../projects/merge_requests_controller_spec.rb | 28 +
spec/controllers/projects_controller_spec.rb | 109 ++-
spec/controllers/snippets_controller_spec.rb | 118 ++++
spec/controllers/users_controller_spec.rb | 23 +-
spec/factories.rb | 12 +
spec/factories/ci/projects.rb | 12 +-
spec/factories/labels.rb | 1 +
spec/factories/lfs_objects.rb | 12 +
spec/factories/lfs_objects_projects.rb | 8 +
spec/factories/merge_requests.rb | 1 +
spec/factories/releases.rb | 21 +
spec/features/admin/admin_users_spec.rb | 50 +-
spec/features/builds_spec.rb | 35 +-
spec/features/ci/events_spec.rb | 22 -
spec/features/commits_spec.rb | 18 +-
spec/features/projects_spec.rb | 29 +-
spec/features/runners_spec.rb | 12 +-
spec/finders/contributed_projects_finder_spec.rb | 35 +
spec/finders/groups_finder_spec.rb | 48 ++
spec/finders/joined_groups_finder_spec.rb | 49 ++
spec/finders/personal_projects_finder_spec.rb | 34 +
spec/finders/projects_finder_spec.rb | 75 +-
spec/helpers/issues_helper_spec.rb | 26 +
spec/helpers/search_helper_spec.rb | 5 +
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 448 +++++++++---
spec/lib/gitlab/backend/grack_auth_spec.rb | 16 +
spec/lib/gitlab/{diff => }/inline_diff_spec.rb | 0
spec/lib/gitlab/lfs/lfs_router_spec.rb | 765 +++++++++++++++++++++
.../gitlab/markdown/sanitization_filter_spec.rb | 101 ++-
spec/lib/gitlab/project_search_results_spec.rb | 4 +-
spec/lib/gitlab/push_data_builder_spec.rb | 6 +
spec/lib/gitlab/sherlock/collection_spec.rb | 82 +++
spec/lib/gitlab/sherlock/file_sample_spec.rb | 54 ++
spec/lib/gitlab/sherlock/line_profiler_spec.rb | 73 ++
spec/lib/gitlab/sherlock/line_sample_spec.rb | 33 +
spec/lib/gitlab/sherlock/location_spec.rb | 40 ++
spec/lib/gitlab/sherlock/middleware_spec.rb | 79 +++
spec/lib/gitlab/sherlock/query_spec.rb | 113 +++
spec/lib/gitlab/sherlock/transaction_spec.rb | 222 ++++++
spec/lib/gitlab/sql/union_spec.rb | 16 +
spec/lib/votes_spec.rb | 188 -----
spec/mailers/notify_spec.rb | 2 +-
spec/models/application_setting_spec.rb | 32 +-
spec/models/build_spec.rb | 15 +
spec/models/ci/commit_spec.rb | 25 +-
spec/models/ci/project_spec.rb | 20 +-
spec/models/ci/runner_project_spec.rb | 2 +-
spec/models/ci/runner_spec.rb | 2 +-
spec/models/ci/service_spec.rb | 2 +-
spec/models/ci/trigger_spec.rb | 12 +
spec/models/ci/variable_spec.rb | 2 +-
spec/models/ci/web_hook_spec.rb | 2 +-
spec/models/commit_status_spec.rb | 33 +
spec/models/event_spec.rb | 38 +
spec/models/generic_commit_status_spec.rb | 33 +
spec/models/global_milestone_spec.rb | 65 ++
spec/models/group_spec.rb | 47 ++
spec/models/label_spec.rb | 1 +
spec/models/merge_request_spec.rb | 32 +
spec/models/milestone_spec.rb | 28 +
spec/models/namespace_spec.rb | 1 +
spec/models/note_spec.rb | 87 +--
.../project_services/gitlab_ci_service_spec.rb | 2 +-
spec/models/project_spec.rb | 39 +-
spec/models/project_wiki_spec.rb | 20 +-
spec/models/release_spec.rb | 28 +
spec/models/repository_spec.rb | 9 +
spec/models/user_spec.rb | 48 +-
spec/requests/api/api_helpers_spec.rb | 26 +-
spec/requests/api/commit_status_spec.rb | 4 +-
spec/requests/api/files_spec.rb | 1 +
spec/requests/api/projects_spec.rb | 57 +-
spec/requests/api/repositories_spec.rb | 75 --
spec/requests/api/services_spec.rb | 1 +
spec/requests/api/tags_spec.rb | 196 ++++++
spec/requests/api/users_spec.rb | 15 +-
spec/requests/ci/api/builds_spec.rb | 196 +++++-
spec/requests/ci/api/commits_spec.rb | 2 +-
spec/requests/ci/api/projects_spec.rb | 106 +--
spec/requests/ci/api/triggers_spec.rb | 2 +-
spec/services/ci/create_commit_service_spec.rb | 24 +-
.../ci/create_trigger_request_service_spec.rb | 2 +-
spec/services/ci/image_for_build_service_spec.rb | 5 +-
spec/services/ci/register_build_service_spec.rb | 4 +
spec/services/issues/update_service_spec.rb | 12 +-
.../merge_requests/refresh_service_spec.rb | 19 +
.../services/merge_requests/update_service_spec.rb | 11 +-
spec/services/milestones/close_service_spec.rb | 28 +
spec/services/milestones/create_service_spec.rb | 24 +
spec/services/milestones/group_service_spec.rb | 70 --
spec/services/notes/create_service_spec.rb | 34 +
spec/services/projects/create_service_spec.rb | 22 +
spec/services/projects/fork_service_spec.rb | 19 +-
spec/support/test_env.rb | 8 +-
spec/tasks/gitlab/backup_rake_spec.rb | 32 +-
spec/workers/repository_fork_worker_spec.rb | 1 -
spec/workers/stuck_ci_builds_worker_spec.rb | 44 ++
vendor/assets/javascripts/clipboard.js | 621 +++++++++++++++++
711 files changed, 13360 insertions(+), 4680 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