[DRE-commits] [gitlab] 01/04: Merge tag 'upstream/8.1.0'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sat Oct 24 16:22:48 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 7e5e325bc285fc5ed78e3e0a59eb9affc08dfcb9
Merge: 39561c1 65b4273
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sat Oct 24 18:46:52 2015 +0530
Merge tag 'upstream/8.1.0'
Upstream version 8.1.0
# gpg: Signature made Saturday 24 October 2015 06:46:42 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 | 8 +
.rubocop.yml | 2 +-
CHANGELOG | 103 ++++++
CHANGELOG-CI | 298 -----------------
GITLAB_GIT_HTTP_SERVER_VERSION | 1 +
Gemfile | 75 ++---
Gemfile.lock | 132 ++++----
PROCESS.md | 6 +-
README.md | 4 +-
VERSION | 2 +-
app/assets/fonts/SourceSansPro-Bold.ttf | Bin 148932 -> 291424 bytes
app/assets/fonts/SourceSansPro-Light.ttf | Bin 150244 -> 293220 bytes
app/assets/fonts/SourceSansPro-Regular.ttf | Bin 149972 -> 293956 bytes
app/assets/fonts/SourceSansPro-Semibold.ttf | Bin 149636 -> 292404 bytes
app/assets/images/logo.svg | 16 +-
app/assets/javascripts/application.js.coffee | 1 +
.../javascripts/behaviors/quick_submit.js.coffee | 29 ++
.../javascripts/behaviors/requires_input.js.coffee | 3 +-
.../javascripts/blob/blob_file_dropzone.js.coffee | 1 +
app/assets/javascripts/ci/Chart.min.js | 39 ---
app/assets/javascripts/ci/build.coffee | 2 +-
app/assets/javascripts/ci/pager.js.coffee | 42 ---
app/assets/javascripts/ci/projects.js.coffee | 3 -
app/assets/javascripts/line_highlighter.js.coffee | 6 +-
.../javascripts/merge_request_tabs.js.coffee | 18 +-
.../javascripts/merge_request_widget.js.coffee | 11 +-
app/assets/javascripts/notes.js.coffee | 23 +-
app/assets/javascripts/shortcuts_navigation.coffee | 1 +
app/assets/javascripts/tree.js.coffee | 5 +-
app/assets/stylesheets/application.scss | 50 +--
app/assets/stylesheets/base/variables.scss | 43 ---
app/assets/stylesheets/framework.scss | 33 ++
.../stylesheets/{generic => framework}/avatar.scss | 2 +
.../stylesheets/{generic => framework}/blocks.scss | 0
app/assets/stylesheets/framework/buttons.scss | 171 ++++++++++
.../{generic => framework}/calendar.scss | 0
.../{generic => framework}/callout.scss | 0
.../stylesheets/{generic => framework}/common.scss | 14 +-
.../stylesheets/{generic => framework}/files.scss | 0
.../{generic => framework}/filters.scss | 0
.../stylesheets/{generic => framework}/flash.scss | 0
.../stylesheets/{base => framework}/fonts.scss | 0
.../stylesheets/{generic => framework}/forms.scss | 20 +-
.../stylesheets/{generic => framework}/gfm.scss | 1 +
.../{themes => framework}/gitlab-theme.scss | 0
.../stylesheets/{generic => framework}/header.scss | 8 +-
.../{generic => framework}/highlight.scss | 0
.../{generic => framework}/issue_box.scss | 2 +-
.../stylesheets/{generic => framework}/jquery.scss | 0
.../stylesheets/{base => framework}/layout.scss | 1 +
.../stylesheets/{generic => framework}/lists.scss | 6 +-
.../{generic => framework}/markdown_area.scss | 0
.../stylesheets/{base => framework}/mixins.scss | 105 +-----
.../stylesheets/{generic => framework}/mobile.scss | 14 +-
.../{generic => framework}/pagination.scss | 2 +
.../{generic => framework}/selects.scss | 44 ++-
.../{generic => framework}/sidebar.scss | 16 +-
.../stylesheets/{generic => framework}/tables.scss | 18 +-
.../{generic => framework}/timeline.scss | 8 +-
.../tw_bootstrap.scss} | 22 --
.../tw_bootstrap_variables.scss} | 6 +-
app/assets/stylesheets/framework/typography.scss | 259 ++++++++++++++
app/assets/stylesheets/framework/variables.scss | 99 ++++++
.../stylesheets/{generic => framework}/zen.scss | 0
app/assets/stylesheets/generic/buttons.scss | 90 -----
app/assets/stylesheets/generic/typography.scss | 113 -------
app/assets/stylesheets/highlight/dark.scss | 11 +-
app/assets/stylesheets/highlight/monokai.scss | 13 +-
.../stylesheets/highlight/solarized_dark.scss | 9 +-
.../stylesheets/highlight/solarized_light.scss | 9 +-
app/assets/stylesheets/highlight/white.scss | 15 +-
app/assets/stylesheets/{ci => pages}/builds.scss | 7 +-
.../{ci/projects.scss => pages/ci_projects.scss} | 34 --
app/assets/stylesheets/pages/commit.scss | 40 ++-
app/assets/stylesheets/pages/commits.scss | 3 +-
app/assets/stylesheets/pages/diff.scss | 114 ++++---
app/assets/stylesheets/pages/groups.scss | 6 +
app/assets/stylesheets/pages/help.scss | 4 +
app/assets/stylesheets/pages/issuable.scss | 9 +-
app/assets/stylesheets/pages/issues.scss | 5 +
app/assets/stylesheets/{ci => pages}/lint.scss | 0
app/assets/stylesheets/pages/merge_requests.scss | 39 ++-
app/assets/stylesheets/pages/note_form.scss | 9 +-
app/assets/stylesheets/pages/notes.scss | 7 +-
app/assets/stylesheets/pages/projects.scss | 250 ++++++++++++--
app/assets/stylesheets/{ci => pages}/runners.scss | 0
app/assets/stylesheets/pages/status.scss | 37 ++
app/assets/stylesheets/pages/tree.scss | 34 +-
app/assets/stylesheets/{ci => pages}/xterm.scss | 2 +-
app/controllers/abuse_reports_controller.rb | 4 +
.../admin/application_settings_controller.rb | 2 +-
.../admin/broadcast_messages_controller.rb | 2 +-
app/controllers/admin/hooks_controller.rb | 2 +-
app/controllers/admin/services_controller.rb | 8 +-
app/controllers/admin/users_controller.rb | 32 +-
app/controllers/application_controller.rb | 19 +-
app/controllers/ci/admin/runners_controller.rb | 9 +-
app/controllers/ci/application_controller.rb | 9 -
app/controllers/ci/builds_controller.rb | 78 -----
app/controllers/ci/charts_controller.rb | 24 --
app/controllers/ci/commits_controller.rb | 38 ---
app/controllers/ci/lints_controller.rb | 2 +-
app/controllers/ci/projects_controller.rb | 98 +-----
app/controllers/ci/runner_projects_controller.rb | 8 +-
app/controllers/ci/runners_controller.rb | 73 ----
app/controllers/ci/services_controller.rb | 59 ----
app/controllers/ci/triggers_controller.rb | 43 ---
app/controllers/ci/variables_controller.rb | 33 --
app/controllers/ci/web_hooks_controller.rb | 53 ---
app/controllers/dashboard/projects_controller.rb | 1 +
app/controllers/groups_controller.rb | 2 +-
app/controllers/import/bitbucket_controller.rb | 2 +-
app/controllers/import/fogbugz_controller.rb | 2 +-
app/controllers/import/github_controller.rb | 6 +-
app/controllers/import/gitlab_controller.rb | 2 +-
app/controllers/import/gitorious_controller.rb | 2 +-
app/controllers/import/google_code_controller.rb | 8 +-
app/controllers/invites_controller.rb | 4 +-
app/controllers/omniauth_callbacks_controller.rb | 4 +-
app/controllers/passwords_controller.rb | 61 ++--
.../profiles/notifications_controller.rb | 2 +-
app/controllers/profiles/preferences_controller.rb | 1 +
app/controllers/profiles_controller.rb | 2 +-
app/controllers/projects/application_controller.rb | 10 +
app/controllers/projects/avatars_controller.rb | 2 +-
app/controllers/projects/blob_controller.rb | 14 +-
app/controllers/projects/builds_controller.rb | 76 +++++
app/controllers/projects/ci_services_controller.rb | 49 +++
app/controllers/projects/ci_settings_controller.rb | 36 ++
.../projects/ci_web_hooks_controller.rb | 45 +++
app/controllers/projects/commit_controller.rb | 17 +
app/controllers/projects/compare_controller.rb | 3 +-
app/controllers/projects/deploy_keys_controller.rb | 2 +-
app/controllers/projects/graphs_controller.rb | 11 +
app/controllers/projects/hooks_controller.rb | 2 +-
app/controllers/projects/issues_controller.rb | 13 +-
.../projects/merge_requests_controller.rb | 9 +-
app/controllers/projects/notes_controller.rb | 4 +-
.../projects/project_members_controller.rb | 3 +-
app/controllers/projects/raw_controller.rb | 2 +-
app/controllers/projects/refs_controller.rb | 7 +
.../projects/repositories_controller.rb | 17 +-
app/controllers/projects/runners_controller.rb | 65 ++++
app/controllers/projects/services_controller.rb | 12 +-
app/controllers/projects/tree_controller.rb | 41 ++-
app/controllers/projects/triggers_controller.rb | 35 ++
app/controllers/projects/uploads_controller.rb | 2 +-
app/controllers/projects/variables_controller.rb | 25 ++
app/controllers/projects/wikis_controller.rb | 2 +-
app/controllers/projects_controller.rb | 2 +-
app/controllers/root_controller.rb | 4 +
app/controllers/uploads_controller.rb | 6 +-
app/finders/issuable_finder.rb | 116 +++++--
app/finders/trending_projects_finder.rb | 11 +-
app/helpers/appearances_helper.rb | 2 +-
app/helpers/application_helper.rb | 16 +-
app/helpers/auth_helper.rb | 2 +-
app/helpers/builds_helper.rb | 13 +
app/helpers/ci/application_helper.rb | 54 ---
app/helpers/ci/builds_helper.rb | 19 --
app/helpers/ci/commits_helper.rb | 24 --
app/helpers/ci/gitlab_helper.rb | 6 +-
app/helpers/ci/icons_helper.rb | 11 -
app/helpers/ci/routes_helper.rb | 29 --
app/helpers/ci/runners_helper.rb | 22 --
app/helpers/ci/triggers_helper.rb | 7 -
app/helpers/ci/user_helper.rb | 15 -
app/helpers/ci_status_helper.rb | 45 +++
app/helpers/commits_helper.rb | 2 +-
app/helpers/diff_helper.rb | 20 ++
app/helpers/gitlab_markdown_helper.rb | 25 +-
app/helpers/gitlab_routing_helper.rb | 12 +
app/helpers/issues_helper.rb | 4 +
app/helpers/labels_helper.rb | 15 +-
app/helpers/merge_requests_helper.rb | 15 +-
app/helpers/milestones_helper.rb | 3 +-
app/helpers/page_layout_helper.rb | 2 +-
app/helpers/preferences_helper.rb | 11 +-
app/helpers/projects_helper.rb | 8 +-
app/helpers/runners_helper.rb | 29 ++
app/helpers/time_helper.rb | 27 ++
app/helpers/triggers_helper.rb | 5 +
app/mailers/abuse_report_mailer.rb | 12 +
app/mailers/ci/notify.rb | 1 -
app/mailers/emails/projects.rb | 3 +-
app/mailers/notify.rb | 2 +-
app/models/ability.rb | 4 +
app/models/abuse_report.rb | 4 +-
app/models/application_setting.rb | 7 +-
app/models/ci/build.rb | 161 +++++----
app/models/ci/commit.rb | 187 ++++-------
app/models/ci/project.rb | 63 ++--
app/models/ci/project_status.rb | 12 -
app/models/ci/runner.rb | 25 +-
app/models/commit.rb | 20 +-
app/models/commit_status.rb | 96 ++++++
app/models/concerns/case_sensitivity.rb | 28 ++
app/models/concerns/issuable.rb | 12 +-
app/models/concerns/mentionable.rb | 52 +--
app/models/concerns/participable.rb | 28 +-
app/models/generic_commit_status.rb | 15 +
app/models/group.rb | 2 +-
app/models/group_label.rb | 9 +
app/models/group_milestone.rb | 12 +-
app/models/issue.rb | 10 +
app/models/label.rb | 5 +
app/models/merge_request.rb | 27 +-
app/models/merge_request_diff.rb | 19 +-
app/models/milestone.rb | 6 +-
app/models/namespace.rb | 6 +-
app/models/note.rb | 24 +-
app/models/project.rb | 75 ++++-
app/models/project_services/bamboo_service.rb | 7 +
app/models/project_services/ci/hip_chat_message.rb | 13 +-
app/models/project_services/ci/hip_chat_service.rb | 2 +-
app/models/project_services/ci/mail_service.rb | 4 +-
app/models/project_services/ci/slack_message.rb | 27 +-
app/models/project_services/ci/slack_service.rb | 2 +-
app/models/project_services/gitlab_ci_service.rb | 55 +--
app/models/project_services/hipchat_service.rb | 25 +-
app/models/project_services/teamcity_service.rb | 7 +
app/models/project_team.rb | 23 +-
app/models/repository.rb | 59 ++--
app/models/service.rb | 30 ++
app/models/user.rb | 30 +-
app/services/archive_repository_service.rb | 47 +--
app/services/ci/create_builds_service.rb | 39 +++
app/services/ci/create_commit_service.rb | 34 +-
app/services/ci/create_project_service.rb | 30 --
app/services/ci/create_trigger_request_service.rb | 13 +-
app/services/ci/register_build_service.rb | 8 +-
app/services/ci/web_hook_service.rb | 3 +-
app/services/files/base_service.rb | 2 +-
app/services/files/create_dir_service.rb | 9 +
app/services/files/create_service.rb | 2 +-
app/services/files/update_service.rb | 2 +-
app/services/git_push_service.rb | 67 ++--
app/services/issues/create_service.rb | 2 +-
app/services/issues/update_service.rb | 2 +-
app/services/labels/group_service.rb | 26 ++
app/services/merge_requests/create_service.rb | 2 +-
app/services/merge_requests/merge_service.rb | 6 +-
app/services/merge_requests/post_merge_service.rb | 10 +
app/services/merge_requests/refresh_service.rb | 90 ++++-
app/services/merge_requests/update_service.rb | 2 +-
app/services/notes/create_service.rb | 8 +-
app/services/notes/update_service.rb | 2 +-
app/services/notification_service.rb | 4 +-
app/services/projects/create_service.rb | 2 +-
app/services/projects/fork_service.rb | 8 +-
app/services/projects/transfer_service.rb | 6 +-
app/services/system_hooks_service.rb | 1 +
app/services/system_note_service.rb | 27 +-
app/uploaders/file_uploader.rb | 2 +-
app/views/abuse_report_mailer/notify.html.haml | 11 +
app/views/abuse_report_mailer/notify.text.haml | 5 +
.../admin/application_settings/_form.html.haml | 15 +-
app/views/admin/applications/index.html.haml | 2 +-
app/views/admin/labels/index.html.haml | 4 +-
app/views/admin/users/_head.html.haml | 2 +
app/views/admin/users/index.html.haml | 16 +-
app/views/admin/users/show.html.haml | 2 +-
app/views/ci/admin/builds/_build.html.haml | 6 +-
app/views/ci/admin/projects/_project.html.haml | 2 +-
app/views/ci/admin/runners/index.html.haml | 2 +-
app/views/ci/admin/runners/show.html.haml | 12 +-
app/views/ci/builds/_build.html.haml | 45 ---
app/views/ci/builds/show.html.haml | 170 ----------
app/views/ci/charts/_overall.haml | 21 --
app/views/ci/charts/show.html.haml | 4 -
app/views/ci/commits/_commit.html.haml | 5 +-
app/views/ci/commits/show.html.haml | 87 -----
app/views/ci/notify/build_fail_email.html.haml | 4 +-
app/views/ci/notify/build_fail_email.text.erb | 4 +-
app/views/ci/notify/build_success_email.html.haml | 4 +-
app/views/ci/notify/build_success_email.text.erb | 4 +-
app/views/ci/projects/_info.html.haml | 2 -
app/views/ci/projects/_project.html.haml | 37 --
app/views/ci/projects/_public.html.haml | 16 -
app/views/ci/projects/_search.html.haml | 11 -
app/views/ci/projects/disabled.html.haml | 1 -
app/views/ci/projects/index.html.haml | 44 +--
app/views/ci/projects/show.html.haml | 60 ----
app/views/ci/shared/_guide.html.haml | 2 +-
app/views/dashboard/_activities.html.haml | 7 +-
app/views/dashboard/milestones/_issue.html.haml | 2 +-
.../dashboard/milestones/_merge_request.html.haml | 2 +-
app/views/dashboard/milestones/show.html.haml | 2 +-
app/views/dashboard/projects/_projects.html.haml | 9 +-
app/views/dashboard/projects/starred.html.haml | 3 +
app/views/devise/passwords/new.html.haml | 2 +-
app/views/events/_event_issue.atom.haml | 3 +-
app/views/events/_event_merge_request.atom.haml | 3 +-
app/views/events/_event_note.atom.haml | 2 +-
app/views/events/_event_push.atom.haml | 2 +-
app/views/explore/groups/index.html.haml | 2 +-
app/views/explore/projects/_filter.html.haml | 2 +-
app/views/groups/_projects.html.haml | 9 +-
.../groups/group_members/_group_member.html.haml | 2 +-
app/views/groups/group_members/index.html.haml | 2 +-
app/views/groups/milestones/_issue.html.haml | 2 +-
.../groups/milestones/_merge_request.html.haml | 2 +-
app/views/groups/milestones/show.html.haml | 2 +-
app/views/groups/show.html.haml | 8 +-
app/views/help/_shortcuts.html.haml | 6 +
app/views/help/ui.html.haml | 52 ++-
app/views/kaminari/gitlab/_first_page.html.haml | 2 +-
app/views/kaminari/gitlab/_last_page.html.haml | 2 +-
app/views/kaminari/gitlab/_paginator.html.haml | 9 +-
app/views/layouts/_head.html.haml | 2 +-
app/views/layouts/_init_auto_complete.html.haml | 3 +-
app/views/layouts/_page.html.haml | 5 +-
app/views/layouts/_search.html.haml | 2 +-
app/views/layouts/ci/_nav_project.html.haml | 48 +--
app/views/layouts/ci/_page.html.haml | 7 +-
app/views/layouts/ci/build.html.haml | 11 -
app/views/layouts/ci/commit.html.haml | 11 -
app/views/layouts/nav/_dashboard.html.haml | 7 +-
app/views/layouts/nav/_project.html.haml | 15 +-
app/views/layouts/nav/_project_settings.html.haml | 36 ++
app/views/layouts/notify.html.haml | 6 +-
app/views/layouts/project.html.haml | 5 +-
app/views/notify/_note_message.html.haml | 2 +-
.../notify/merged_merge_request_email.text.haml | 2 +-
app/views/notify/new_issue_email.html.haml | 2 +-
app/views/notify/new_merge_request_email.html.haml | 2 +-
app/views/notify/project_was_moved_email.html.haml | 2 +-
app/views/notify/project_was_moved_email.text.erb | 2 +-
app/views/profiles/keys/_key_details.html.haml | 5 +-
app/views/profiles/preferences/show.html.haml | 7 +
app/views/profiles/preferences/update.js.erb | 7 +
app/views/profiles/show.html.haml | 2 +-
app/views/projects/_activity.html.haml | 7 +-
app/views/projects/_home_panel.html.haml | 29 +-
app/views/projects/_md_preview.html.haml | 4 +-
app/views/projects/_readme.html.haml | 2 +-
app/views/projects/_zen.html.haml | 6 +-
app/views/projects/blob/_blob.html.haml | 2 +-
app/views/projects/blob/_editor.html.haml | 2 +-
app/views/projects/blob/_new_dir.html.haml | 25 ++
app/views/projects/blob/_upload.html.haml | 9 +-
app/views/projects/blob/new.html.haml | 9 +-
app/views/projects/builds/_build.html.haml | 53 +++
app/views/projects/builds/index.html.haml | 52 +++
app/views/projects/builds/show.html.haml | 178 ++++++++++
app/views/projects/buttons/_dropdown.html.haml | 2 +-
app/views/projects/buttons/_fork.html.haml | 1 -
.../projects/buttons/_notifications.html.haml | 32 +-
app/views/projects/buttons/_star.html.haml | 5 -
.../ci_services}/_form.html.haml | 7 +-
.../ci_services}/edit.html.haml | 0
.../ci_services}/index.html.haml | 4 +-
.../ci_settings}/_form.html.haml | 37 +-
.../ci_settings}/_no_runners.html.haml | 2 +-
.../ci_settings}/edit.html.haml | 11 +-
.../ci_web_hooks}/index.html.haml | 10 +-
app/views/projects/commit/_ci_menu.html.haml | 7 +
app/views/projects/commit/_commit_box.html.haml | 7 +
app/views/projects/commit/ci.html.haml | 67 ++++
app/views/projects/commit/show.html.haml | 1 +
.../commit_statuses/_commit_status.html.haml | 54 +++
app/views/projects/commits/_commit.html.haml | 10 +-
app/views/projects/diffs/_diffs.html.haml | 13 +-
app/views/projects/diffs/_file.html.haml | 28 +-
app/views/projects/diffs/_stats.html.haml | 30 +-
app/views/projects/edit.html.haml | 4 +-
app/views/projects/empty.html.haml | 89 ++---
app/views/projects/forks/new.html.haml | 63 ++--
app/views/projects/graphs/_head.html.haml | 4 +
app/views/projects/graphs/ci.html.haml | 7 +
.../graphs/ci}/_build_times.haml | 0
.../{ci/charts => projects/graphs/ci}/_builds.haml | 0
app/views/projects/graphs/ci/_overall.haml | 22 ++
app/views/projects/imports/new.html.haml | 2 +-
app/views/projects/issues/_closed_by_box.html.haml | 3 +
app/views/projects/issues/show.html.haml | 3 +-
app/views/projects/labels/_form.html.haml | 2 +-
.../projects/merge_requests/_new_submit.html.haml | 5 +-
app/views/projects/merge_requests/_show.html.haml | 7 +-
.../merge_requests/widget/_heading.html.haml | 15 +-
.../merge_requests/widget/_merged.html.haml | 2 +-
app/views/projects/milestones/_form.html.haml | 4 +-
app/views/projects/milestones/_issue.html.haml | 2 +-
.../projects/milestones/_merge_request.html.haml | 2 +-
app/views/projects/milestones/show.html.haml | 2 +-
app/views/projects/new.html.haml | 20 +-
app/views/projects/notes/_edit_form.html.haml | 2 +-
app/views/projects/notes/_form.html.haml | 4 +-
app/views/projects/notes/_note.html.haml | 16 +-
.../project_members/_project_member.html.haml | 2 +-
app/views/projects/project_members/index.html.haml | 2 +-
.../repositories/_download_archive.html.haml | 4 +-
.../{ci => projects}/runners/_runner.html.haml | 13 +-
.../runners/_shared_runners.html.haml | 8 +-
.../runners/_specific_runners.html.haml | 6 +-
app/views/{ci => projects}/runners/edit.html.haml | 2 +-
app/views/{ci => projects}/runners/index.html.haml | 0
app/views/{ci => projects}/runners/show.html.haml | 0
app/views/projects/show.html.haml | 9 +-
app/views/projects/tree/_readme.html.haml | 13 +-
app/views/projects/tree/_tree.html.haml | 96 +++---
.../{ci => projects}/triggers/_trigger.html.haml | 2 +-
.../{ci => projects}/triggers/index.html.haml | 10 +-
.../{ci => projects}/variables/show.html.haml | 10 +-
app/views/projects/wikis/_form.html.haml | 2 +-
app/views/projects/wikis/pages.html.haml | 1 +
app/views/search/_form.html.haml | 2 +-
app/views/shared/_clone_panel.html.haml | 6 +-
.../shared/_commit_message_container.html.haml | 2 +-
app/views/shared/_field.html.haml | 7 +-
.../images/logo.svg => views/shared/_logo.svg} | 23 +-
app/views/shared/issuable/_filter.html.haml | 9 +-
app/views/shared/issuable/_form.html.haml | 4 +-
app/views/shared/issuable/_search_form.html.haml | 2 +-
app/views/shared/projects/_list.html.haml | 6 +-
app/views/shared/projects/_project.html.haml | 16 +-
app/views/users/show.html.haml | 17 +-
app/workers/repository_archive_cache_worker.rb | 9 +
app/workers/repository_archive_worker.rb | 43 ---
config/application.rb | 2 +-
config/environments/development.rb | 2 +-
config/gitlab.yml.example | 55 ++-
config/initializers/1_settings.rb | 8 +-
config/initializers/active_record_query_trace.rb | 5 +
config/initializers/bullet.rb | 6 +
config/initializers/devise.rb | 4 +
config/initializers/rack_lineprof.rb | 31 ++
config/locales/devise.en.yml | 104 +++---
config/mail_room.yml | 39 +++
config/mail_room.yml.example | 29 --
config/routes.rb | 96 +++---
db/fixtures/development/04_project.rb | 7 +-
db/fixtures/development/05_users.rb | 4 +-
db/fixtures/development/07_milestones.rb | 2 +-
db/fixtures/development/09_issues.rb | 2 +-
db/fixtures/development/12_snippets.rb | 2 +-
.../20150924125150_add_project_id_to_ci_commit.rb | 5 +
...0924125436_migrate_project_id_for_ci_commits.rb | 6 +
.../20150930001110_merge_request_error_field.rb | 5 +
...50930095736_add_null_to_name_for_ci_projects.rb | 9 +
.../20151002112914_add_stage_idx_to_builds.rb | 5 +
db/migrate/20151002121400_add_index_for_builds.rb | 5 +
.../20151002122929_add_ref_and_tag_to_builds.rb | 6 +
.../20151002122943_migrate_ref_and_tag_to_build.rb | 6 +
db/migrate/20151005075649_add_user_id_to_build.rb | 5 +
.../20151005150751_add_layout_option_for_users.rb | 5 +
..._remove_ci_enabled_from_application_settings.rb | 5 +
...20511_namespaces_projects_path_lower_indexes.rb | 17 +
...10232_add_users_lower_username_email_indexes.rb | 17 +
...008123042_add_type_and_description_to_builds.rb | 9 +
...30321_migrate_name_to_description_for_builds.rb | 5 +
...8143519_add_admin_notification_email_setting.rb | 5 +
...16131433_add_ci_projects_gl_project_id_index.rb | 5 +
...016195451_add_ci_builds_and_projects_indexes.rb | 9 +
.../20151016195706_add_notes_line_code_index.rb | 5 +
db/migrate/20151019111551_fix_build_tags.rb | 5 +
.../20151019111703_fail_build_without_names.rb | 5 +
db/migrate/20151020173516_ci_limits_to_mysql.rb | 9 +
...0151020173906_add_ci_builds_index_for_status.rb | 5 +
db/migrate/limits_to_mysql.rb | 4 -
db/schema.rb | 29 +-
doc/api/commits.md | 84 ++++-
doc/api/merge_requests.md | 2 +
doc/api/projects.md | 6 +
doc/ci/api/projects.md | 5 -
doc/ci/docker/using_docker_build.md | 5 +-
doc/ci/variables/README.md | 38 ++-
doc/ci/yaml/README.md | 52 ++-
doc/customization/welcome_message.md | 30 +-
doc/development/README.md | 1 +
doc/development/benchmarking.md | 69 ++++
doc/development/profiling.md | 56 ++++
doc/gitlab-basics/README.md | 2 +
doc/gitlab-basics/create-issue.md | 27 ++
doc/gitlab-basics/create-your-ssh-keys.md | 6 +-
doc/hooks/custom_hooks.md | 2 +-
doc/incoming_email/README.md | 236 +++++++------
doc/install/installation.md | 21 +-
doc/integration/ldap.md | 20 ++
doc/markdown/markdown.md | 5 +-
doc/migrate_ci_to_ce/README.md | 125 ++++++-
doc/raketasks/backup_restore.md | 16 +-
doc/raketasks/cleanup.md | 3 +-
doc/raketasks/user_management.md | 14 +
doc/release/monthly.md | 13 +-
doc/ssh/README.md | 26 +-
doc/system_hooks/system_hooks.md | 42 +--
doc/update/7.14-to-8.0.md | 30 +-
doc/update/{7.14-to-8.0.md => 8.0-to-8.1.md} | 90 ++---
doc/update/patch_versions.md | 6 +-
doc/update/upgrader.md | 2 +-
doc/web_hooks/web_hooks.md | 6 +-
docker-compose.yml | 2 +
docker/.dockerignore | 1 -
docker/Dockerfile | 50 ---
docker/README.md | 172 +---------
docker/assets/wrapper | 21 --
docker/fig.yml | 2 -
docker/marathon.json | 31 --
docker/troubleshooting.md | 84 -----
features/abuse_report.feature | 7 +
features/dashboard/dashboard.feature | 4 +-
features/dashboard/new_project.feature | 10 +-
features/project/commits/commits.feature | 7 +
features/project/graph.feature | 6 +
features/project/merge_requests.feature | 36 +-
features/project/service.feature | 1 +
features/project/source/browse_files.feature | 39 ++-
features/steps/abuse_reports.rb | 4 +
features/steps/admin/labels.rb | 2 +-
features/steps/admin/projects.rb | 2 +
features/steps/dashboard/dashboard.rb | 4 +
features/steps/dashboard/new_project.rb | 6 +-
features/steps/groups.rb | 50 +--
features/steps/project/commits/commits.rb | 19 ++
features/steps/project/fork.rb | 3 +-
features/steps/project/graph.rb | 18 +-
features/steps/project/issues/issues.rb | 4 +-
features/steps/project/merge_requests.rb | 36 +-
features/steps/project/redirects.rb | 2 -
features/steps/project/services.rb | 4 +
features/steps/project/source/browse_files.rb | 74 +++-
features/steps/shared/group.rb | 2 +-
features/steps/shared/project.rb | 10 +
lib/api/api.rb | 1 +
lib/api/commit_statuses.rb | 80 +++++
lib/api/entities.rb | 21 +-
lib/api/helpers.rb | 5 +-
lib/api/merge_requests.rb | 14 +-
lib/api/project_hooks.rb | 6 +-
lib/api/repositories.rb | 13 +-
lib/api/services.rb | 2 +-
lib/api/users.rb | 11 +
lib/backup/manager.rb | 7 +-
lib/ci/api/api.rb | 4 -
lib/ci/api/commits.rb | 2 +-
lib/ci/api/entities.rb | 4 +-
lib/ci/api/helpers.rb | 6 -
lib/ci/api/projects.rb | 23 +-
lib/ci/gitlab_ci_yaml_processor.rb | 12 +-
lib/ci/migrate/builds.rb | 29 --
lib/ci/migrate/database.rb | 67 ----
lib/ci/migrate/manager.rb | 72 ----
lib/ci/migrate/tags.rb | 42 ---
lib/ci/project_list_builder.rb | 21 --
lib/ci/status.rb | 21 ++
lib/event_filter.rb | 2 +-
lib/extracts_path.rb | 2 +-
lib/gitlab/backend/grack_auth.rb | 9 +-
lib/gitlab/backend/shell.rb | 3 +-
lib/gitlab/contributions_calendar.rb | 1 -
lib/gitlab/database.rb | 11 +
lib/gitlab/diff/file.rb | 8 +
lib/gitlab/diff/line.rb | 8 +
lib/gitlab/diff/parser.rb | 2 -
lib/gitlab/fogbugz_import/importer.rb | 2 +-
lib/gitlab/fogbugz_import/project_creator.rb | 2 +-
lib/gitlab/google_code_import/project_creator.rb | 2 +-
lib/gitlab/incoming_email.rb | 4 +-
lib/gitlab/ldap/user.rb | 4 +-
lib/gitlab/markdown.rb | 120 ++++---
.../markdown/commit_range_reference_filter.rb | 16 +-
lib/gitlab/markdown/commit_reference_filter.rb | 24 +-
lib/gitlab/markdown/cross_project_reference.rb | 11 +-
.../markdown/external_issue_reference_filter.rb | 3 +-
lib/gitlab/markdown/issue_reference_filter.rb | 8 +-
lib/gitlab/markdown/label_reference_filter.rb | 8 +-
.../markdown/merge_request_reference_filter.rb | 8 +-
lib/gitlab/markdown/redactor_filter.rb | 40 +++
lib/gitlab/markdown/reference_filter.rb | 65 ++--
lib/gitlab/markdown/reference_gatherer_filter.rb | 63 ++++
lib/gitlab/markdown/snippet_reference_filter.rb | 8 +-
lib/gitlab/markdown/upload_link_filter.rb | 47 +++
lib/gitlab/markdown/user_reference_filter.rb | 45 ++-
lib/gitlab/reference_extractor.rb | 30 +-
lib/gitlab/uploads_transfer.rb | 35 ++
lib/support/nginx/gitlab | 20 +-
lib/support/nginx/gitlab-ssl | 20 +-
lib/tasks/ci/migrate.rake | 87 -----
lib/tasks/gitlab/check.rake | 37 +-
lib/tasks/gitlab/cleanup.rake | 49 +--
lib/tasks/gitlab/setup.rake | 1 +
lib/tasks/gitlab/two_factor.rake | 23 ++
lib/tasks/migrate/setup_postgresql.rake | 8 +
lib/tasks/spec.rake | 13 +-
public/robots.txt | 3 +-
public/uploads/.gitkeep | 0
.../finders/trending_projects_finder_spec.rb | 14 +
spec/benchmarks/models/project_spec.rb | 50 +++
spec/benchmarks/models/project_team_spec.rb | 23 ++
spec/benchmarks/models/user_spec.rb | 42 +++
spec/controllers/abuse_reports_controller_spec.rb | 72 ++++
spec/controllers/admin/users_controller_spec.rb | 41 +++
spec/controllers/ci/commits_controller_spec.rb | 27 --
spec/controllers/ci/projects_controller_spec.rb | 50 ---
spec/controllers/import/github_controller_spec.rb | 2 +-
spec/controllers/invites_controller_spec.rb | 33 ++
.../controllers/projects/issues_controller_spec.rb | 14 +-
.../projects/repositories_controller_spec.rb | 28 --
.../projects/services_controller_spec.rb | 47 ++-
spec/controllers/projects/tree_controller_spec.rb | 36 ++
.../projects/uploads_controller_spec.rb | 4 +-
spec/controllers/projects_controller_spec.rb | 14 +
spec/controllers/root_controller_spec.rb | 24 +-
spec/factories/ci/builds.rb | 7 +
spec/factories/ci/commits.rb | 56 +---
spec/factories/ci/projects.rb | 14 +-
spec/factories/commit_statuses.rb | 15 +
spec/features/admin/admin_users_spec.rb | 21 ++
spec/features/builds_spec.rb | 89 +++++
spec/features/ci/admin/builds_spec.rb | 11 +-
spec/features/ci/admin/runners_spec.rb | 27 +-
spec/features/ci/builds_spec.rb | 60 ----
spec/features/ci/commits_spec.rb | 69 ----
spec/features/ci/projects_spec.rb | 60 ----
spec/features/ci_settings_spec.rb | 22 ++
spec/features/ci_web_hooks_spec.rb | 27 ++
spec/features/commits_spec.rb | 61 ++++
spec/features/login_spec.rb | 2 +-
spec/features/markdown_spec.rb | 2 +-
spec/features/password_reset_spec.rb | 62 ++--
spec/features/projects_spec.rb | 2 +-
spec/features/{ci => }/runners_spec.rb | 25 +-
spec/features/{ci => }/triggers_spec.rb | 9 +-
spec/features/users_spec.rb | 4 +-
spec/features/{ci => }/variables_spec.rb | 15 +-
spec/finders/issues_finder_spec.rb | 20 ++
spec/finders/trending_projects_finder_spec.rb | 39 +++
spec/helpers/application_helper_spec.rb | 9 +
spec/helpers/ci_status_helper_spec.rb | 18 +
spec/helpers/gitlab_markdown_helper_spec.rb | 53 ++-
spec/helpers/issues_helper_spec.rb | 10 +
spec/helpers/merge_requests_helper.rb | 12 -
spec/helpers/merge_requests_helper_spec.rb | 32 ++
spec/helpers/preferences_helper_spec.rb | 8 +-
spec/helpers/projects_helper_spec.rb | 18 +-
spec/helpers/{ci => }/runners_helper_spec.rb | 4 +-
...lication_helper_spec.rb => time_helper_spec.rb} | 2 +-
.../behaviors/quick_submit_spec.js.coffee | 70 ++++
.../fixtures/behaviors/quick_submit.html.haml | 6 +
.../fixtures/line_highlighter.html.haml | 2 +-
spec/javascripts/line_highlighter_spec.js.coffee | 2 +-
spec/javascripts/spec_helper.coffee | 1 +
spec/lib/ci/charts_spec.rb | 5 +-
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 46 ++-
spec/lib/gitlab/backend/grack_auth_spec.rb | 4 +-
spec/lib/gitlab/backend/shell_spec.rb | 13 +
spec/lib/gitlab/closing_issue_extractor_spec.rb | 10 +-
spec/lib/gitlab/database_spec.rb | 17 +
spec/lib/gitlab/email/attachment_uploader_spec.rb | 1 -
spec/lib/gitlab/ldap/user_spec.rb | 21 ++
.../markdown/commit_range_reference_filter_spec.rb | 70 ++--
.../markdown/commit_reference_filter_spec.rb | 66 ++--
.../markdown/cross_project_reference_spec.rb | 36 +-
.../gitlab/markdown/issue_reference_filter_spec.rb | 76 ++---
.../gitlab/markdown/label_reference_filter_spec.rb | 18 +-
.../merge_request_reference_filter_spec.rb | 66 ++--
spec/lib/gitlab/markdown/redactor_filter_spec.rb | 91 +++++
.../markdown/reference_gatherer_filter_spec.rb | 89 +++++
.../markdown/snippet_reference_filter_spec.rb | 64 ++--
.../lib/gitlab/markdown/upload_link_filter_spec.rb | 75 +++++
.../gitlab/markdown/user_reference_filter_spec.rb | 55 +--
spec/lib/gitlab/o_auth/user_spec.rb | 4 -
spec/lib/gitlab/reference_extractor_spec.rb | 14 +-
spec/lib/gitlab/uploads_transfer_spec.rb | 50 +++
spec/mailers/ci/notify_spec.rb | 3 +-
spec/mailers/notify_spec.rb | 3 +-
spec/models/abuse_report_spec.rb | 12 +
spec/models/broadcast_message_spec.rb | 4 +-
spec/models/{ci => }/build_spec.rb | 301 ++++++++++-------
spec/models/ci/commit_spec.rb | 371 +++++++++++++++------
.../ci/project_services/hip_chat_message_spec.rb | 85 ++---
.../ci/project_services/hip_chat_service_spec.rb | 7 +-
.../ci/{ => project_services}/mail_service_spec.rb | 31 +-
.../ci/project_services/slack_message_spec.rb | 99 ++----
.../ci/project_services/slack_service_spec.rb | 7 +-
spec/models/ci/project_spec.rb | 127 +++++--
spec/models/ci/runner_spec.rb | 67 +++-
spec/models/ci/service_spec.rb | 5 +-
spec/models/commit_spec.rb | 4 +-
spec/models/commit_status_spec.rb | 164 +++++++++
spec/models/concerns/case_sensitivity_spec.rb | 189 +++++++++++
spec/models/concerns/issuable_spec.rb | 1 -
spec/models/concerns/mentionable_spec.rb | 2 +-
spec/models/generic_commit_status_spec.rb | 39 +++
spec/models/hooks/project_hook_spec.rb | 4 +-
spec/models/hooks/service_hook_spec.rb | 2 -
spec/models/hooks/web_hook_spec.rb | 2 -
spec/models/issue_spec.rb | 39 ++-
spec/models/merge_request_spec.rb | 11 +
spec/models/milestone_spec.rb | 6 +-
spec/models/note_spec.rb | 5 +-
.../models/project_services/bamboo_service_spec.rb | 94 ++++++
.../project_services/gitlab_ci_service_spec.rb | 29 +-
.../project_services/hipchat_service_spec.rb | 4 +-
.../project_services/teamcity_service_spec.rb | 93 ++++++
spec/models/project_spec.rb | 62 +++-
spec/models/project_team_spec.rb | 12 +
spec/models/project_wiki_spec.rb | 2 +-
spec/models/service_spec.rb | 121 +++++++
spec/models/user_spec.rb | 21 ++
spec/models/wiki_page_spec.rb | 2 +-
spec/requests/api/commit_status_spec.rb | 135 ++++++++
spec/requests/api/commits_spec.rb | 13 +
spec/requests/api/merge_requests_spec.rb | 5 +
spec/requests/api/project_hooks_spec.rb | 27 +-
spec/requests/api/repositories_spec.rb | 9 +-
spec/requests/api/services_spec.rb | 33 +-
spec/requests/api/users_spec.rb | 14 +
spec/requests/ci/api/builds_spec.rb | 33 +-
spec/requests/ci/api/commits_spec.rb | 6 +-
spec/requests/ci/api/projects_spec.rb | 12 +-
spec/requests/ci/api/triggers_spec.rb | 19 +-
spec/requests/ci/builds_spec.rb | 18 -
spec/requests/ci/commits_spec.rb | 17 -
spec/services/archive_repository_service_spec.rb | 69 +---
spec/services/ci/create_commit_service_spec.rb | 67 ++--
spec/services/ci/create_project_service_spec.rb | 37 --
.../ci/create_trigger_request_service_spec.rb | 34 +-
spec/services/ci/event_service_spec.rb | 6 +-
spec/services/ci/image_for_build_service_spec.rb | 3 +-
spec/services/ci/register_build_service_spec.rb | 11 +-
spec/services/ci/web_hook_service_spec.rb | 3 +-
spec/services/git_push_service_spec.rb | 10 +-
spec/services/merge_requests/merge_service_spec.rb | 14 +
.../merge_requests/refresh_service_spec.rb | 21 ++
spec/services/notification_service_spec.rb | 6 +-
spec/services/projects/download_service_spec.rb | 2 -
spec/services/projects/fork_service_spec.rb | 12 +-
spec/services/projects/transfer_service_spec.rb | 2 +
spec/services/projects/upload_service_spec.rb | 4 -
spec/services/system_hooks_service_spec.rb | 4 +-
spec/services/system_note_service_spec.rb | 12 +
spec/spec_helper.rb | 7 +-
spec/support/filter_spec_helper.rb | 23 +-
spec/support/markdown_feature.rb | 32 +-
spec/support/matchers/benchmark_matchers.rb | 61 ++++
spec/support/mentionable_shared_examples.rb | 17 +-
spec/support/services_shared_context.rb | 8 +-
spec/support/setup_builds_storage.rb | 6 +-
spec/support/stub_gitlab_calls.rb | 8 +
spec/support/test_env.rb | 2 +-
spec/tasks/gitlab/backup_rake_spec.rb | 2 +-
spec/workers/repository_archive_worker_spec.rb | 79 -----
tmp/.gitkeep | 0
746 files changed, 10400 insertions(+), 6894 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