Attachment 161805 Details for Bug 203619 – GitLab 8.0.4

[patch] GitLab 8.0.4

gitlab-v8.0.4.diff (text/plain), 85.79 KB, created by Torsten Zühlsdorff on 2015-10-07 13:28:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Torsten Zühlsdorff

Created: 2015-10-07 13:28:00 UTC

Size: 85.79 KB

patch

obsolete

>Index: pkg-plist
>===================================================================
>--- pkg-plist	(.../gitlab)	(Revision 192)
>+++ pkg-plist	(.../gitlab8)	(Revision 192)
>@@ -10,6 +10,7 @@
> %%WWWDIR%%/.simplecov
> %%WWWDIR%%/.teatro.yml
> %%WWWDIR%%/CHANGELOG
>+%%WWWDIR%%/CHANGELOG-CI
> %%WWWDIR%%/CONTRIBUTING.md
> %%WWWDIR%%/GITLAB_SHELL_VERSION
> %%WWWDIR%%/Gemfile
>@@ -20,6 +21,19 @@
> %%WWWDIR%%/README.md
> %%WWWDIR%%/Rakefile
> %%WWWDIR%%/VERSION
>+%%WWWDIR%%/app/assets/fonts/OFL.txt
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-Black.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-BlackItalic.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-Bold.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-BoldItalic.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-ExtraLight.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-ExtraLightItalic.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-Italic.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-Light.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-LightItalic.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-Regular.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-Semibold.ttf
>+%%WWWDIR%%/app/assets/fonts/SourceSansPro-SemiboldItalic.ttf
> %%WWWDIR%%/app/assets/images/auth_buttons/bitbucket_64.png
> %%WWWDIR%%/app/assets/images/auth_buttons/github_64.png
> %%WWWDIR%%/app/assets/images/auth_buttons/gitlab_64.png
>@@ -29,6 +43,12 @@
> %%WWWDIR%%/app/assets/images/bg_fallback.png
> %%WWWDIR%%/app/assets/images/brand_logo.png
> %%WWWDIR%%/app/assets/images/chosen-sprite.png
>+%%WWWDIR%%/app/assets/images/ci/arch.jpg
>+%%WWWDIR%%/app/assets/images/ci/favicon.ico
>+%%WWWDIR%%/app/assets/images/ci/loader.gif
>+%%WWWDIR%%/app/assets/images/ci/no_avatar.png
>+%%WWWDIR%%/app/assets/images/ci/rails.png
>+%%WWWDIR%%/app/assets/images/ci/service_sample.png
> %%WWWDIR%%/app/assets/images/dark-scheme-preview.png
> %%WWWDIR%%/app/assets/images/diff_note_add.png
> %%WWWDIR%%/app/assets/images/favicon.ico
>@@ -67,10 +87,16 @@
> %%WWWDIR%%/app/assets/javascripts/behaviors/details_behavior.coffee
> %%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js.coffee
> %%WWWDIR%%/app/assets/javascripts/behaviors/toggler_behavior.coffee
>+%%WWWDIR%%/app/assets/javascripts/blob/blob_file_dropzone.js.coffee
> %%WWWDIR%%/app/assets/javascripts/blob/edit_blob.js.coffee
> %%WWWDIR%%/app/assets/javascripts/blob/new_blob.js.coffee
> %%WWWDIR%%/app/assets/javascripts/branch-graph.js.coffee
> %%WWWDIR%%/app/assets/javascripts/calendar.js.coffee
>+%%WWWDIR%%/app/assets/javascripts/ci/Chart.min.js
>+%%WWWDIR%%/app/assets/javascripts/ci/application.js.coffee
>+%%WWWDIR%%/app/assets/javascripts/ci/build.coffee
>+%%WWWDIR%%/app/assets/javascripts/ci/pager.js.coffee
>+%%WWWDIR%%/app/assets/javascripts/ci/projects.js.coffee
> %%WWWDIR%%/app/assets/javascripts/commit.js.coffee
> %%WWWDIR%%/app/assets/javascripts/commit/file.js.coffee
> %%WWWDIR%%/app/assets/javascripts/commit/image-file.js.coffee
>@@ -128,6 +154,7 @@
> %%WWWDIR%%/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
> %%WWWDIR%%/app/assets/javascripts/stat_graph_contributors_util.js.coffee
> %%WWWDIR%%/app/assets/javascripts/subscription.js.coffee
>+%%WWWDIR%%/app/assets/javascripts/syntax_highlight.coffee
> %%WWWDIR%%/app/assets/javascripts/tree.js.coffee
> %%WWWDIR%%/app/assets/javascripts/user.js.coffee
> %%WWWDIR%%/app/assets/javascripts/users_select.js.coffee
>@@ -134,6 +161,7 @@
> %%WWWDIR%%/app/assets/javascripts/wikis.js.coffee
> %%WWWDIR%%/app/assets/javascripts/zen_mode.js.coffee
> %%WWWDIR%%/app/assets/stylesheets/application.scss
>+%%WWWDIR%%/app/assets/stylesheets/base/fonts.scss
> %%WWWDIR%%/app/assets/stylesheets/base/gl_bootstrap.scss
> %%WWWDIR%%/app/assets/stylesheets/base/gl_variables.scss
> %%WWWDIR%%/app/assets/stylesheets/base/layout.scss
>@@ -140,10 +168,16 @@
> %%WWWDIR%%/app/assets/stylesheets/base/mixins.scss
> %%WWWDIR%%/app/assets/stylesheets/base/variables.scss
> %%WWWDIR%%/app/assets/stylesheets/behaviors.scss
>+%%WWWDIR%%/app/assets/stylesheets/ci/builds.scss
>+%%WWWDIR%%/app/assets/stylesheets/ci/lint.scss
>+%%WWWDIR%%/app/assets/stylesheets/ci/projects.scss
>+%%WWWDIR%%/app/assets/stylesheets/ci/runners.scss
>+%%WWWDIR%%/app/assets/stylesheets/ci/xterm.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/avatar.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/blocks.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/buttons.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/calendar.scss
>+%%WWWDIR%%/app/assets/stylesheets/generic/callout.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/common.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/files.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/filters.scss
>@@ -157,6 +191,7 @@
> %%WWWDIR%%/app/assets/stylesheets/generic/lists.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/markdown_area.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/mobile.scss
>+%%WWWDIR%%/app/assets/stylesheets/generic/pagination.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/selects.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/sidebar.scss
> %%WWWDIR%%/app/assets/stylesheets/generic/tables.scss
>@@ -215,6 +250,7 @@
> %%WWWDIR%%/app/controllers/admin/hooks_controller.rb
> %%WWWDIR%%/app/controllers/admin/identities_controller.rb
> %%WWWDIR%%/app/controllers/admin/keys_controller.rb
>+%%WWWDIR%%/app/controllers/admin/labels_controller.rb
> %%WWWDIR%%/app/controllers/admin/logs_controller.rb
> %%WWWDIR%%/app/controllers/admin/projects_controller.rb
> %%WWWDIR%%/app/controllers/admin/services_controller.rb
>@@ -221,6 +257,26 @@
> %%WWWDIR%%/app/controllers/admin/users_controller.rb
> %%WWWDIR%%/app/controllers/application_controller.rb
> %%WWWDIR%%/app/controllers/autocomplete_controller.rb
>+%%WWWDIR%%/app/controllers/ci/admin/application_controller.rb
>+%%WWWDIR%%/app/controllers/ci/admin/application_settings_controller.rb
>+%%WWWDIR%%/app/controllers/ci/admin/builds_controller.rb
>+%%WWWDIR%%/app/controllers/ci/admin/events_controller.rb
>+%%WWWDIR%%/app/controllers/ci/admin/projects_controller.rb
>+%%WWWDIR%%/app/controllers/ci/admin/runner_projects_controller.rb
>+%%WWWDIR%%/app/controllers/ci/admin/runners_controller.rb
>+%%WWWDIR%%/app/controllers/ci/application_controller.rb
>+%%WWWDIR%%/app/controllers/ci/builds_controller.rb
>+%%WWWDIR%%/app/controllers/ci/charts_controller.rb
>+%%WWWDIR%%/app/controllers/ci/commits_controller.rb
>+%%WWWDIR%%/app/controllers/ci/events_controller.rb
>+%%WWWDIR%%/app/controllers/ci/lints_controller.rb
>+%%WWWDIR%%/app/controllers/ci/projects_controller.rb
>+%%WWWDIR%%/app/controllers/ci/runner_projects_controller.rb
>+%%WWWDIR%%/app/controllers/ci/runners_controller.rb
>+%%WWWDIR%%/app/controllers/ci/services_controller.rb
>+%%WWWDIR%%/app/controllers/ci/triggers_controller.rb
>+%%WWWDIR%%/app/controllers/ci/variables_controller.rb
>+%%WWWDIR%%/app/controllers/ci/web_hooks_controller.rb
> %%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb
> %%WWWDIR%%/app/controllers/confirmations_controller.rb
> %%WWWDIR%%/app/controllers/dashboard/application_controller.rb
>@@ -227,10 +283,12 @@
> %%WWWDIR%%/app/controllers/dashboard/groups_controller.rb
> %%WWWDIR%%/app/controllers/dashboard/milestones_controller.rb
> %%WWWDIR%%/app/controllers/dashboard/projects_controller.rb
>+%%WWWDIR%%/app/controllers/dashboard/snippets_controller.rb
> %%WWWDIR%%/app/controllers/dashboard_controller.rb
> %%WWWDIR%%/app/controllers/explore/application_controller.rb
> %%WWWDIR%%/app/controllers/explore/groups_controller.rb
> %%WWWDIR%%/app/controllers/explore/projects_controller.rb
>+%%WWWDIR%%/app/controllers/explore/snippets_controller.rb
> %%WWWDIR%%/app/controllers/groups/application_controller.rb
> %%WWWDIR%%/app/controllers/groups/avatars_controller.rb
> %%WWWDIR%%/app/controllers/groups/group_members_controller.rb
>@@ -239,6 +297,7 @@
> %%WWWDIR%%/app/controllers/help_controller.rb
> %%WWWDIR%%/app/controllers/import/base_controller.rb
> %%WWWDIR%%/app/controllers/import/bitbucket_controller.rb
>+%%WWWDIR%%/app/controllers/import/fogbugz_controller.rb
> %%WWWDIR%%/app/controllers/import/github_controller.rb
> %%WWWDIR%%/app/controllers/import/gitlab_controller.rb
> %%WWWDIR%%/app/controllers/import/gitorious_controller.rb
>@@ -314,6 +373,15 @@
> %%WWWDIR%%/app/helpers/blob_helper.rb
> %%WWWDIR%%/app/helpers/branches_helper.rb
> %%WWWDIR%%/app/helpers/broadcast_messages_helper.rb
>+%%WWWDIR%%/app/helpers/ci/application_helper.rb
>+%%WWWDIR%%/app/helpers/ci/builds_helper.rb
>+%%WWWDIR%%/app/helpers/ci/commits_helper.rb
>+%%WWWDIR%%/app/helpers/ci/gitlab_helper.rb
>+%%WWWDIR%%/app/helpers/ci/icons_helper.rb
>+%%WWWDIR%%/app/helpers/ci/projects_helper.rb
>+%%WWWDIR%%/app/helpers/ci/runners_helper.rb
>+%%WWWDIR%%/app/helpers/ci/triggers_helper.rb
>+%%WWWDIR%%/app/helpers/ci/user_helper.rb
> %%WWWDIR%%/app/helpers/commits_helper.rb
> %%WWWDIR%%/app/helpers/compare_helper.rb
> %%WWWDIR%%/app/helpers/dashboard_helper.rb
>@@ -349,8 +417,11 @@
> %%WWWDIR%%/app/helpers/tree_helper.rb
> %%WWWDIR%%/app/helpers/version_check_helper.rb
> %%WWWDIR%%/app/helpers/visibility_level_helper.rb
>-%%WWWDIR%%/app/helpers/wiki_helper.rb
>+%%WWWDIR%%/app/mailers/base_mailer.rb
>+%%WWWDIR%%/app/mailers/ci/emails/builds.rb
>+%%WWWDIR%%/app/mailers/ci/notify.rb
> %%WWWDIR%%/app/mailers/devise_mailer.rb
>+%%WWWDIR%%/app/mailers/email_rejection_mailer.rb
> %%WWWDIR%%/app/mailers/emails/groups.rb
> %%WWWDIR%%/app/mailers/emails/issues.rb
> %%WWWDIR%%/app/mailers/emails/merge_requests.rb
>@@ -363,6 +434,19 @@
> %%WWWDIR%%/app/models/application_setting.rb
> %%WWWDIR%%/app/models/audit_event.rb
> %%WWWDIR%%/app/models/broadcast_message.rb
>+%%WWWDIR%%/app/models/ci/application_setting.rb
>+%%WWWDIR%%/app/models/ci/build.rb
>+%%WWWDIR%%/app/models/ci/commit.rb
>+%%WWWDIR%%/app/models/ci/event.rb
>+%%WWWDIR%%/app/models/ci/project.rb
>+%%WWWDIR%%/app/models/ci/project_status.rb
>+%%WWWDIR%%/app/models/ci/runner.rb
>+%%WWWDIR%%/app/models/ci/runner_project.rb
>+%%WWWDIR%%/app/models/ci/service.rb
>+%%WWWDIR%%/app/models/ci/trigger.rb
>+%%WWWDIR%%/app/models/ci/trigger_request.rb
>+%%WWWDIR%%/app/models/ci/variable.rb
>+%%WWWDIR%%/app/models/ci/web_hook.rb
> %%WWWDIR%%/app/models/commit.rb
> %%WWWDIR%%/app/models/commit_range.rb
> %%WWWDIR%%/app/models/concerns/internal_id.rb
>@@ -411,8 +495,14 @@
> %%WWWDIR%%/app/models/project_services/bamboo_service.rb
> %%WWWDIR%%/app/models/project_services/buildkite_service.rb
> %%WWWDIR%%/app/models/project_services/campfire_service.rb
>+%%WWWDIR%%/app/models/project_services/ci/hip_chat_message.rb
>+%%WWWDIR%%/app/models/project_services/ci/hip_chat_service.rb
>+%%WWWDIR%%/app/models/project_services/ci/mail_service.rb
>+%%WWWDIR%%/app/models/project_services/ci/slack_message.rb
>+%%WWWDIR%%/app/models/project_services/ci/slack_service.rb
> %%WWWDIR%%/app/models/project_services/ci_service.rb
> %%WWWDIR%%/app/models/project_services/custom_issue_tracker_service.rb
>+%%WWWDIR%%/app/models/project_services/drone_ci_service.rb
> %%WWWDIR%%/app/models/project_services/emails_on_push_service.rb
> %%WWWDIR%%/app/models/project_services/external_wiki_service.rb
> %%WWWDIR%%/app/models/project_services/flowdock_service.rb
>@@ -439,6 +529,7 @@
> %%WWWDIR%%/app/models/protected_branch.rb
> %%WWWDIR%%/app/models/repository.rb
> %%WWWDIR%%/app/models/security_event.rb
>+%%WWWDIR%%/app/models/sent_notification.rb
> %%WWWDIR%%/app/models/service.rb
> %%WWWDIR%%/app/models/snippet.rb
> %%WWWDIR%%/app/models/subscription.rb
>@@ -449,6 +540,14 @@
> %%WWWDIR%%/app/services/archive_repository_service.rb
> %%WWWDIR%%/app/services/audit_event_service.rb
> %%WWWDIR%%/app/services/base_service.rb
>+%%WWWDIR%%/app/services/ci/create_commit_service.rb
>+%%WWWDIR%%/app/services/ci/create_project_service.rb
>+%%WWWDIR%%/app/services/ci/create_trigger_request_service.rb
>+%%WWWDIR%%/app/services/ci/event_service.rb
>+%%WWWDIR%%/app/services/ci/image_for_build_service.rb
>+%%WWWDIR%%/app/services/ci/register_build_service.rb
>+%%WWWDIR%%/app/services/ci/test_hook_service.rb
>+%%WWWDIR%%/app/services/ci/web_hook_service.rb
> %%WWWDIR%%/app/services/compare_service.rb
> %%WWWDIR%%/app/services/create_branch_service.rb
> %%WWWDIR%%/app/services/create_snippet_service.rb
>@@ -472,13 +571,12 @@
> %%WWWDIR%%/app/services/issues/create_service.rb
> %%WWWDIR%%/app/services/issues/reopen_service.rb
> %%WWWDIR%%/app/services/issues/update_service.rb
>-%%WWWDIR%%/app/services/merge_requests/auto_merge_service.rb
>-%%WWWDIR%%/app/services/merge_requests/base_merge_service.rb
> %%WWWDIR%%/app/services/merge_requests/base_service.rb
> %%WWWDIR%%/app/services/merge_requests/build_service.rb
> %%WWWDIR%%/app/services/merge_requests/close_service.rb
> %%WWWDIR%%/app/services/merge_requests/create_service.rb
> %%WWWDIR%%/app/services/merge_requests/merge_service.rb
>+%%WWWDIR%%/app/services/merge_requests/post_merge_service.rb
> %%WWWDIR%%/app/services/merge_requests/refresh_service.rb
> %%WWWDIR%%/app/services/merge_requests/reopen_service.rb
> %%WWWDIR%%/app/services/merge_requests/update_service.rb
>@@ -485,6 +583,7 @@
> %%WWWDIR%%/app/services/milestones/base_service.rb
> %%WWWDIR%%/app/services/milestones/close_service.rb
> %%WWWDIR%%/app/services/milestones/create_service.rb
>+%%WWWDIR%%/app/services/milestones/destroy_service.rb
> %%WWWDIR%%/app/services/milestones/group_service.rb
> %%WWWDIR%%/app/services/milestones/reopen_service.rb
> %%WWWDIR%%/app/services/milestones/update_service.rb
>@@ -495,6 +594,7 @@
> %%WWWDIR%%/app/services/projects/autocomplete_service.rb
> %%WWWDIR%%/app/services/projects/create_service.rb
> %%WWWDIR%%/app/services/projects/destroy_service.rb
>+%%WWWDIR%%/app/services/projects/download_service.rb
> %%WWWDIR%%/app/services/projects/fork_service.rb
> %%WWWDIR%%/app/services/projects/participants_service.rb
> %%WWWDIR%%/app/services/projects/transfer_service.rb
>@@ -537,6 +637,12 @@
> %%WWWDIR%%/app/views/admin/identities/edit.html.haml
> %%WWWDIR%%/app/views/admin/identities/index.html.haml
> %%WWWDIR%%/app/views/admin/keys/show.html.haml
>+%%WWWDIR%%/app/views/admin/labels/_form.html.haml
>+%%WWWDIR%%/app/views/admin/labels/_label.html.haml
>+%%WWWDIR%%/app/views/admin/labels/destroy.js.haml
>+%%WWWDIR%%/app/views/admin/labels/edit.html.haml
>+%%WWWDIR%%/app/views/admin/labels/index.html.haml
>+%%WWWDIR%%/app/views/admin/labels/new.html.haml
> %%WWWDIR%%/app/views/admin/logs/show.html.haml
> %%WWWDIR%%/app/views/admin/projects/index.html.haml
> %%WWWDIR%%/app/views/admin/projects/show.html.haml
>@@ -552,10 +658,68 @@
> %%WWWDIR%%/app/views/admin/users/new.html.haml
> %%WWWDIR%%/app/views/admin/users/projects.html.haml
> %%WWWDIR%%/app/views/admin/users/show.html.haml
>+%%WWWDIR%%/app/views/ci/admin/application_settings/_form.html.haml
>+%%WWWDIR%%/app/views/ci/admin/application_settings/show.html.haml
>+%%WWWDIR%%/app/views/ci/admin/builds/_build.html.haml
>+%%WWWDIR%%/app/views/ci/admin/builds/index.html.haml
>+%%WWWDIR%%/app/views/ci/admin/events/index.html.haml
>+%%WWWDIR%%/app/views/ci/admin/projects/_project.html.haml
>+%%WWWDIR%%/app/views/ci/admin/projects/index.html.haml
>+%%WWWDIR%%/app/views/ci/admin/runner_projects/index.html.haml
>+%%WWWDIR%%/app/views/ci/admin/runners/_runner.html.haml
>+%%WWWDIR%%/app/views/ci/admin/runners/index.html.haml
>+%%WWWDIR%%/app/views/ci/admin/runners/show.html.haml
>+%%WWWDIR%%/app/views/ci/admin/runners/update.js.haml
>+%%WWWDIR%%/app/views/ci/builds/_build.html.haml
>+%%WWWDIR%%/app/views/ci/builds/show.html.haml
>+%%WWWDIR%%/app/views/ci/charts/_build_times.haml
>+%%WWWDIR%%/app/views/ci/charts/_builds.haml
>+%%WWWDIR%%/app/views/ci/charts/_overall.haml
>+%%WWWDIR%%/app/views/ci/charts/show.html.haml
>+%%WWWDIR%%/app/views/ci/commits/_commit.html.haml
>+%%WWWDIR%%/app/views/ci/commits/show.html.haml
>+%%WWWDIR%%/app/views/ci/errors/show.haml
>+%%WWWDIR%%/app/views/ci/events/index.html.haml
>+%%WWWDIR%%/app/views/ci/lints/_create.html.haml
>+%%WWWDIR%%/app/views/ci/lints/create.js.haml
>+%%WWWDIR%%/app/views/ci/lints/show.html.haml
>+%%WWWDIR%%/app/views/ci/notify/build_fail_email.html.haml
>+%%WWWDIR%%/app/views/ci/notify/build_fail_email.text.erb
>+%%WWWDIR%%/app/views/ci/notify/build_success_email.html.haml
>+%%WWWDIR%%/app/views/ci/notify/build_success_email.text.erb
>+%%WWWDIR%%/app/views/ci/projects/_form.html.haml
>+%%WWWDIR%%/app/views/ci/projects/_info.html.haml
>+%%WWWDIR%%/app/views/ci/projects/_no_runners.html.haml
>+%%WWWDIR%%/app/views/ci/projects/_project.html.haml
>+%%WWWDIR%%/app/views/ci/projects/_public.html.haml
>+%%WWWDIR%%/app/views/ci/projects/_search.html.haml
>+%%WWWDIR%%/app/views/ci/projects/disabled.html.haml
>+%%WWWDIR%%/app/views/ci/projects/edit.html.haml
>+%%WWWDIR%%/app/views/ci/projects/index.html.haml
>+%%WWWDIR%%/app/views/ci/projects/show.html.haml
>+%%WWWDIR%%/app/views/ci/runners/_runner.html.haml
>+%%WWWDIR%%/app/views/ci/runners/_shared_runners.html.haml
>+%%WWWDIR%%/app/views/ci/runners/_specific_runners.html.haml
>+%%WWWDIR%%/app/views/ci/runners/edit.html.haml
>+%%WWWDIR%%/app/views/ci/runners/index.html.haml
>+%%WWWDIR%%/app/views/ci/runners/show.html.haml
>+%%WWWDIR%%/app/views/ci/services/_form.html.haml
>+%%WWWDIR%%/app/views/ci/services/edit.html.haml
>+%%WWWDIR%%/app/views/ci/services/index.html.haml
>+%%WWWDIR%%/app/views/ci/shared/_guide.html.haml
>+%%WWWDIR%%/app/views/ci/shared/_no_runners.html.haml
>+%%WWWDIR%%/app/views/ci/triggers/_trigger.html.haml
>+%%WWWDIR%%/app/views/ci/triggers/index.html.haml
>+%%WWWDIR%%/app/views/ci/user_sessions/new.html.haml
>+%%WWWDIR%%/app/views/ci/variables/show.html.haml
>+%%WWWDIR%%/app/views/ci/web_hooks/index.html.haml
> %%WWWDIR%%/app/views/dashboard/_activities.html.haml
>-%%WWWDIR%%/app/views/dashboard/_projects.html.haml
>+%%WWWDIR%%/app/views/dashboard/_activity_head.html.haml
>+%%WWWDIR%%/app/views/dashboard/_groups_head.html.haml
>+%%WWWDIR%%/app/views/dashboard/_projects_head.html.haml
> %%WWWDIR%%/app/views/dashboard/_sidebar.html.haml
>-%%WWWDIR%%/app/views/dashboard/_zero_authorized_projects.html.haml
>+%%WWWDIR%%/app/views/dashboard/_snippets_head.html.haml
>+%%WWWDIR%%/app/views/dashboard/activity.html.haml
> %%WWWDIR%%/app/views/dashboard/groups/index.html.haml
> %%WWWDIR%%/app/views/dashboard/issues.atom.builder
> %%WWWDIR%%/app/views/dashboard/issues.html.haml
>@@ -567,9 +731,12 @@
> %%WWWDIR%%/app/views/dashboard/milestones/_milestone.html.haml
> %%WWWDIR%%/app/views/dashboard/milestones/index.html.haml
> %%WWWDIR%%/app/views/dashboard/milestones/show.html.haml
>+%%WWWDIR%%/app/views/dashboard/projects/_projects.html.haml
>+%%WWWDIR%%/app/views/dashboard/projects/_zero_authorized_projects.html.haml
>+%%WWWDIR%%/app/views/dashboard/projects/index.atom.builder
>+%%WWWDIR%%/app/views/dashboard/projects/index.html.haml
> %%WWWDIR%%/app/views/dashboard/projects/starred.html.haml
>-%%WWWDIR%%/app/views/dashboard/show.atom.builder
>-%%WWWDIR%%/app/views/dashboard/show.html.haml
>+%%WWWDIR%%/app/views/dashboard/snippets/index.html.haml
> %%WWWDIR%%/app/views/devise/confirmations/new.html.haml
> %%WWWDIR%%/app/views/devise/mailer/confirmation_instructions.html.erb
> %%WWWDIR%%/app/views/devise/mailer/reset_password_instructions.html.erb
>@@ -579,6 +746,7 @@
> %%WWWDIR%%/app/views/devise/registrations/edit.html.erb
> %%WWWDIR%%/app/views/devise/registrations/new.html.haml
> %%WWWDIR%%/app/views/devise/sessions/_new_base.html.haml
>+%%WWWDIR%%/app/views/devise/sessions/_new_crowd.html.haml
> %%WWWDIR%%/app/views/devise/sessions/_new_ldap.html.haml
> %%WWWDIR%%/app/views/devise/sessions/new.html.haml
> %%WWWDIR%%/app/views/devise/sessions/two_factor.html.haml
>@@ -599,6 +767,8 @@
> %%WWWDIR%%/app/views/doorkeeper/authorizations/show.html.haml
> %%WWWDIR%%/app/views/doorkeeper/authorized_applications/_delete_form.html.haml
> %%WWWDIR%%/app/views/doorkeeper/authorized_applications/index.html.haml
>+%%WWWDIR%%/app/views/email_rejection_mailer/rejection.html.haml
>+%%WWWDIR%%/app/views/email_rejection_mailer/rejection.text.haml
> %%WWWDIR%%/app/views/errors/access_denied.html.haml
> %%WWWDIR%%/app/views/errors/encoding.html.haml
> %%WWWDIR%%/app/views/errors/git_not_found.html.haml
>@@ -616,12 +786,15 @@
> %%WWWDIR%%/app/views/events/event/_created_project.html.haml
> %%WWWDIR%%/app/views/events/event/_note.html.haml
> %%WWWDIR%%/app/views/events/event/_push.html.haml
>+%%WWWDIR%%/app/views/explore/_head.html.haml
> %%WWWDIR%%/app/views/explore/groups/index.html.haml
>+%%WWWDIR%%/app/views/explore/projects/_dropdown.html.haml
> %%WWWDIR%%/app/views/explore/projects/_filter.html.haml
>-%%WWWDIR%%/app/views/explore/projects/_project.html.haml
>+%%WWWDIR%%/app/views/explore/projects/_projects.html.haml
> %%WWWDIR%%/app/views/explore/projects/index.html.haml
> %%WWWDIR%%/app/views/explore/projects/starred.html.haml
> %%WWWDIR%%/app/views/explore/projects/trending.html.haml
>+%%WWWDIR%%/app/views/explore/snippets/index.html.haml
> %%WWWDIR%%/app/views/groups/_projects.html.haml
> %%WWWDIR%%/app/views/groups/edit.html.haml
> %%WWWDIR%%/app/views/groups/group_members/_group_member.html.haml
>@@ -631,6 +804,7 @@
> %%WWWDIR%%/app/views/groups/issues.atom.builder
> %%WWWDIR%%/app/views/groups/issues.html.haml
> %%WWWDIR%%/app/views/groups/merge_requests.html.haml
>+%%WWWDIR%%/app/views/groups/milestones/_header_title.html.haml
> %%WWWDIR%%/app/views/groups/milestones/_issue.html.haml
> %%WWWDIR%%/app/views/groups/milestones/_issues.html.haml
> %%WWWDIR%%/app/views/groups/milestones/_merge_request.html.haml
>@@ -649,6 +823,9 @@
> %%WWWDIR%%/app/views/help/ui.html.haml
> %%WWWDIR%%/app/views/import/base/create.js.haml
> %%WWWDIR%%/app/views/import/bitbucket/status.html.haml
>+%%WWWDIR%%/app/views/import/fogbugz/new.html.haml
>+%%WWWDIR%%/app/views/import/fogbugz/new_user_map.html.haml
>+%%WWWDIR%%/app/views/import/fogbugz/status.html.haml
> %%WWWDIR%%/app/views/import/github/status.html.haml
> %%WWWDIR%%/app/views/import/gitlab/status.html.haml
> %%WWWDIR%%/app/views/import/gitorious/status.html.haml
>@@ -677,6 +854,16 @@
> %%WWWDIR%%/app/views/layouts/_user_styles.html.haml
> %%WWWDIR%%/app/views/layouts/admin.html.haml
> %%WWWDIR%%/app/views/layouts/application.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/_info.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/_nav_admin.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/_nav_project.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/_page.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/admin.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/application.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/build.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/commit.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/notify.html.haml
>+%%WWWDIR%%/app/views/layouts/ci/project.html.haml
> %%WWWDIR%%/app/views/layouts/dashboard.html.haml
> %%WWWDIR%%/app/views/layouts/devise.html.haml
> %%WWWDIR%%/app/views/layouts/errors.html.haml
>@@ -695,7 +882,6 @@
> %%WWWDIR%%/app/views/layouts/nav/_profile.html.haml
> %%WWWDIR%%/app/views/layouts/nav/_project.html.haml
> %%WWWDIR%%/app/views/layouts/nav/_project_settings.html.haml
>-%%WWWDIR%%/app/views/layouts/nav/_snippets.html.haml
> %%WWWDIR%%/app/views/layouts/notify.html.haml
> %%WWWDIR%%/app/views/layouts/profile.html.haml
> %%WWWDIR%%/app/views/layouts/project.html.haml
>@@ -797,9 +983,11 @@
> %%WWWDIR%%/app/views/projects/blob/_blob.html.haml
> %%WWWDIR%%/app/views/projects/blob/_download.html.haml
> %%WWWDIR%%/app/views/projects/blob/_editor.html.haml
>+%%WWWDIR%%/app/views/projects/blob/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/blob/_image.html.haml
> %%WWWDIR%%/app/views/projects/blob/_remove.html.haml
> %%WWWDIR%%/app/views/projects/blob/_text.html.haml
>+%%WWWDIR%%/app/views/projects/blob/_upload.html.haml
> %%WWWDIR%%/app/views/projects/blob/diff.html.haml
> %%WWWDIR%%/app/views/projects/blob/edit.html.haml
> %%WWWDIR%%/app/views/projects/blob/new.html.haml
>@@ -806,11 +994,13 @@
> %%WWWDIR%%/app/views/projects/blob/preview.html.haml
> %%WWWDIR%%/app/views/projects/blob/show.html.haml
> %%WWWDIR%%/app/views/projects/branches/_branch.html.haml
>+%%WWWDIR%%/app/views/projects/branches/_commit.html.haml
> %%WWWDIR%%/app/views/projects/branches/destroy.js.haml
> %%WWWDIR%%/app/views/projects/branches/index.html.haml
> %%WWWDIR%%/app/views/projects/branches/new.html.haml
> %%WWWDIR%%/app/views/projects/buttons/_dropdown.html.haml
> %%WWWDIR%%/app/views/projects/buttons/_fork.html.haml
>+%%WWWDIR%%/app/views/projects/buttons/_notifications.html.haml
> %%WWWDIR%%/app/views/projects/buttons/_star.html.haml
> %%WWWDIR%%/app/views/projects/commit/_commit_box.html.haml
> %%WWWDIR%%/app/views/projects/commit/branches.html.haml
>@@ -819,6 +1009,7 @@
> %%WWWDIR%%/app/views/projects/commits/_commit_list.html.haml
> %%WWWDIR%%/app/views/projects/commits/_commits.html.haml
> %%WWWDIR%%/app/views/projects/commits/_head.html.haml
>+%%WWWDIR%%/app/views/projects/commits/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/commits/_inline_commit.html.haml
> %%WWWDIR%%/app/views/projects/commits/show.atom.builder
> %%WWWDIR%%/app/views/projects/commits/show.html.haml
>@@ -844,6 +1035,7 @@
> %%WWWDIR%%/app/views/projects/forks/new.html.haml
> %%WWWDIR%%/app/views/projects/go_import.html.haml
> %%WWWDIR%%/app/views/projects/graphs/_head.html.haml
>+%%WWWDIR%%/app/views/projects/graphs/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/graphs/commits.html.haml
> %%WWWDIR%%/app/views/projects/graphs/show.html.haml
> %%WWWDIR%%/app/views/projects/hooks/index.html.haml
>@@ -851,6 +1043,7 @@
> %%WWWDIR%%/app/views/projects/imports/show.html.haml
> %%WWWDIR%%/app/views/projects/issues/_discussion.html.haml
> %%WWWDIR%%/app/views/projects/issues/_form.html.haml
>+%%WWWDIR%%/app/views/projects/issues/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/issues/_issue.html.haml
> %%WWWDIR%%/app/views/projects/issues/_issues.html.haml
> %%WWWDIR%%/app/views/projects/issues/edit.html.haml
>@@ -860,6 +1053,7 @@
> %%WWWDIR%%/app/views/projects/issues/show.html.haml
> %%WWWDIR%%/app/views/projects/issues/update.js.haml
> %%WWWDIR%%/app/views/projects/labels/_form.html.haml
>+%%WWWDIR%%/app/views/projects/labels/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/labels/_label.html.haml
> %%WWWDIR%%/app/views/projects/labels/destroy.js.haml
> %%WWWDIR%%/app/views/projects/labels/edit.html.haml
>@@ -868,12 +1062,12 @@
> %%WWWDIR%%/app/views/projects/merge_requests/_discussion.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/_form.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/_head.html.haml
>+%%WWWDIR%%/app/views/projects/merge_requests/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/_merge_request.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/_merge_requests.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/_new_compare.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/_new_submit.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/_show.html.haml
>-%%WWWDIR%%/app/views/projects/merge_requests/automerge.js.haml
> %%WWWDIR%%/app/views/projects/merge_requests/branch_from.js.haml
> %%WWWDIR%%/app/views/projects/merge_requests/branch_to.js.haml
> %%WWWDIR%%/app/views/projects/merge_requests/diffs.html.haml
>@@ -880,6 +1074,7 @@
> %%WWWDIR%%/app/views/projects/merge_requests/edit.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/index.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/invalid.html.haml
>+%%WWWDIR%%/app/views/projects/merge_requests/merge.js.haml
> %%WWWDIR%%/app/views/projects/merge_requests/new.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/show.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/show/_commits.html.haml
>@@ -901,12 +1096,12 @@
> %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_check.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
>-%%WWWDIR%%/app/views/projects/merge_requests/widget/open/_no_satellite.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_nothing.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_reload.html.haml
> %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_wip.html.haml
> %%WWWDIR%%/app/views/projects/milestones/_form.html.haml
>+%%WWWDIR%%/app/views/projects/milestones/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/milestones/_issue.html.haml
> %%WWWDIR%%/app/views/projects/milestones/_issues.html.haml
> %%WWWDIR%%/app/views/projects/milestones/_merge_request.html.haml
>@@ -938,6 +1133,7 @@
> %%WWWDIR%%/app/views/projects/notes/discussions/_diff.html.haml
> %%WWWDIR%%/app/views/projects/notes/discussions/_outdated.html.haml
> %%WWWDIR%%/app/views/projects/project_members/_group_members.html.haml
>+%%WWWDIR%%/app/views/projects/project_members/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/project_members/_new_project_member.html.haml
> %%WWWDIR%%/app/views/projects/project_members/_project_member.html.haml
> %%WWWDIR%%/app/views/projects/project_members/_team.html.haml
>@@ -954,7 +1150,7 @@
> %%WWWDIR%%/app/views/projects/services/index.html.haml
> %%WWWDIR%%/app/views/projects/show.atom.builder
> %%WWWDIR%%/app/views/projects/show.html.haml
>-%%WWWDIR%%/app/views/projects/snippets/_snippet.html.haml
>+%%WWWDIR%%/app/views/projects/snippets/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/snippets/edit.html.haml
> %%WWWDIR%%/app/views/projects/snippets/index.html.haml
> %%WWWDIR%%/app/views/projects/snippets/new.html.haml
>@@ -974,6 +1170,7 @@
> %%WWWDIR%%/app/views/projects/tree/show.html.haml
> %%WWWDIR%%/app/views/projects/update.js.haml
> %%WWWDIR%%/app/views/projects/wikis/_form.html.haml
>+%%WWWDIR%%/app/views/projects/wikis/_header_title.html.haml
> %%WWWDIR%%/app/views/projects/wikis/_main_links.html.haml
> %%WWWDIR%%/app/views/projects/wikis/_nav.html.haml
> %%WWWDIR%%/app/views/projects/wikis/_new.html.haml
>@@ -991,8 +1188,8 @@
> %%WWWDIR%%/app/views/search/results/_empty.html.haml
> %%WWWDIR%%/app/views/search/results/_issue.html.haml
> %%WWWDIR%%/app/views/search/results/_merge_request.html.haml
>+%%WWWDIR%%/app/views/search/results/_milestone.html.haml
> %%WWWDIR%%/app/views/search/results/_note.html.haml
>-%%WWWDIR%%/app/views/search/results/_project.html.haml
> %%WWWDIR%%/app/views/search/results/_snippet_blob.html.haml
> %%WWWDIR%%/app/views/search/results/_snippet_title.html.haml
> %%WWWDIR%%/app/views/search/results/_wiki_blob.html.haml
>@@ -1012,8 +1209,6 @@
> %%WWWDIR%%/app/views/shared/_no_password.html.haml
> %%WWWDIR%%/app/views/shared/_no_ssh.html.haml
> %%WWWDIR%%/app/views/shared/_outdated_browser.html.haml
>-%%WWWDIR%%/app/views/shared/_project.html.haml
>-%%WWWDIR%%/app/views/shared/_projects_list.html.haml
> %%WWWDIR%%/app/views/shared/_promo.html.haml
> %%WWWDIR%%/app/views/shared/_ref_switcher.html.haml
> %%WWWDIR%%/app/views/shared/_service_settings.html.haml
>@@ -1021,20 +1216,21 @@
> %%WWWDIR%%/app/views/shared/_sort_dropdown.html.haml
> %%WWWDIR%%/app/views/shared/_visibility_level.html.haml
> %%WWWDIR%%/app/views/shared/_visibility_radios.html.haml
>+%%WWWDIR%%/app/views/shared/groups/_group.html.haml
> %%WWWDIR%%/app/views/shared/issuable/_context.html.haml
> %%WWWDIR%%/app/views/shared/issuable/_filter.html.haml
> %%WWWDIR%%/app/views/shared/issuable/_form.html.haml
> %%WWWDIR%%/app/views/shared/issuable/_search_form.html.haml
>+%%WWWDIR%%/app/views/shared/projects/_list.html.haml
>+%%WWWDIR%%/app/views/shared/projects/_project.html.haml
> %%WWWDIR%%/app/views/shared/snippets/_blob.html.haml
> %%WWWDIR%%/app/views/shared/snippets/_form.html.haml
>-%%WWWDIR%%/app/views/snippets/_snippet.html.haml
>+%%WWWDIR%%/app/views/shared/snippets/_snippet.html.haml
> %%WWWDIR%%/app/views/snippets/_snippets.html.haml
>-%%WWWDIR%%/app/views/snippets/current_user_index.html.haml
> %%WWWDIR%%/app/views/snippets/edit.html.haml
> %%WWWDIR%%/app/views/snippets/index.html.haml
> %%WWWDIR%%/app/views/snippets/new.html.haml
> %%WWWDIR%%/app/views/snippets/show.html.haml
>-%%WWWDIR%%/app/views/snippets/user_index.html.haml
> %%WWWDIR%%/app/views/users/_groups.html.haml
> %%WWWDIR%%/app/views/users/_profile.html.haml
> %%WWWDIR%%/app/views/users/_projects.html.haml
>@@ -1044,21 +1240,28 @@
> %%WWWDIR%%/app/views/users/show.html.haml
> %%WWWDIR%%/app/views/votes/_votes_block.html.haml
> %%WWWDIR%%/app/views/votes/_votes_inline.html.haml
>-%%WWWDIR%%/app/workers/auto_merge_worker.rb
>+%%WWWDIR%%/app/workers/ci/hip_chat_notifier_worker.rb
>+%%WWWDIR%%/app/workers/ci/slack_notifier_worker.rb
>+%%WWWDIR%%/app/workers/ci/web_hook_worker.rb
>+%%WWWDIR%%/app/workers/email_receiver_worker.rb
> %%WWWDIR%%/app/workers/emails_on_push_worker.rb
>-%%WWWDIR%%/app/workers/fork_registration_worker.rb
> %%WWWDIR%%/app/workers/gitlab_shell_worker.rb
> %%WWWDIR%%/app/workers/irker_worker.rb
>+%%WWWDIR%%/app/workers/merge_worker.rb
> %%WWWDIR%%/app/workers/post_receive.rb
> %%WWWDIR%%/app/workers/project_cache_worker.rb
> %%WWWDIR%%/app/workers/project_service_worker.rb
> %%WWWDIR%%/app/workers/project_web_hook_worker.rb
> %%WWWDIR%%/app/workers/repository_archive_worker.rb
>+%%WWWDIR%%/app/workers/repository_fork_worker.rb
> %%WWWDIR%%/app/workers/repository_import_worker.rb
> %%WWWDIR%%/app/workers/system_hook_worker.rb
> @(git,,544) %%WWWDIR%%/bin/background_jobs
> @(git,,544) %%WWWDIR%%/bin/bundle
> @(git,,544) %%WWWDIR%%/bin/check
>+@(git,,544) %%WWWDIR%%/bin/ci/upgrade.rb
>+@(git,,544) %%WWWDIR%%/bin/daemon_with_pidfile
>+@(git,,544) %%WWWDIR%%/bin/mail_room
> @(git,,544) %%WWWDIR%%/bin/pkgr_before_precompile.sh
> @(git,,544) %%WWWDIR%%/bin/rails
> @(git,,544) %%WWWDIR%%/bin/rake
>@@ -1080,15 +1283,14 @@
> %%WWWDIR%%/config/gitlab.teatro.yml
> %%WWWDIR%%/config/initializers/1_settings.rb
> %%WWWDIR%%/config/initializers/2_app.rb
>-%%WWWDIR%%/config/initializers/3_grit_ext.rb
>-%%WWWDIR%%/config/initializers/4_sidekiq.rb
>+%%WWWDIR%%/config/initializers/4_ci_app.rb
> %%WWWDIR%%/config/initializers/5_backend.rb
>-%%WWWDIR%%/config/initializers/6_rack_profiler.rb
>-%%WWWDIR%%/config/initializers/7_omniauth.rb
>-%%WWWDIR%%/config/initializers/8_default_url_options.rb
> %%WWWDIR%%/config/initializers/attr_encrypted_no_db_connection.rb
> %%WWWDIR%%/config/initializers/backtrace_silencers.rb
> %%WWWDIR%%/config/initializers/carrierwave.rb
>+%%WWWDIR%%/config/initializers/connection_fix.rb
>+%%WWWDIR%%/config/initializers/cookies_serializer.rb
>+%%WWWDIR%%/config/initializers/default_url_options.rb
> %%WWWDIR%%/config/initializers/devise.rb
> %%WWWDIR%%/config/initializers/devise_async.rb
> %%WWWDIR%%/config/initializers/devise_password_length.rb.example
>@@ -1099,11 +1301,14 @@
> %%WWWDIR%%/config/initializers/inflections.rb
> %%WWWDIR%%/config/initializers/kaminari_config.rb
> %%WWWDIR%%/config/initializers/mime_types.rb
>+%%WWWDIR%%/config/initializers/omniauth.rb
> %%WWWDIR%%/config/initializers/postgresql_limit_fix.rb
> %%WWWDIR%%/config/initializers/public_key.rb
> %%WWWDIR%%/config/initializers/rack_attack_git_basic_auth.rb
>+%%WWWDIR%%/config/initializers/rack_profiler.rb
> %%WWWDIR%%/config/initializers/secret_token.rb
> %%WWWDIR%%/config/initializers/session_store.rb
>+%%WWWDIR%%/config/initializers/sidekiq.rb
> %%WWWDIR%%/config/initializers/smtp_settings.rb.sample
> %%WWWDIR%%/config/initializers/state_machine_patch.rb
> %%WWWDIR%%/config/initializers/static_files.rb
>@@ -1112,8 +1317,12 @@
> %%WWWDIR%%/config/locales/devise.en.yml
> %%WWWDIR%%/config/locales/doorkeeper.en.yml
> %%WWWDIR%%/config/locales/en.yml
>+%%WWWDIR%%/config/mail_room.yml.example
> %%WWWDIR%%/config/newrelic.yml
> %%WWWDIR%%/config/routes.rb
>+%%WWWDIR%%/config/schedule.rb
>+%%WWWDIR%%/config/secrets.yml.example
>+%%WWWDIR%%/config/sidekiq.yml.example
> %%WWWDIR%%/config/unicorn.rb.example.development
> %%WWWDIR%%/db/fixtures/development/01_admin.rb
> %%WWWDIR%%/db/fixtures/development/04_project.rb
>@@ -1297,6 +1506,22 @@
> %%WWWDIR%%/db/migrate/20150717130904_add_commits_count_to_project.rb
> %%WWWDIR%%/db/migrate/20150730122406_add_updated_by_to_issuables_and_notes.rb
> %%WWWDIR%%/db/migrate/20150806104937_create_abuse_reports.rb
>+%%WWWDIR%%/db/migrate/20150812080800_add_settings_import_sources.rb
>+%%WWWDIR%%/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
>+%%WWWDIR%%/db/migrate/20150817163600_deduplicate_user_identities.rb
>+%%WWWDIR%%/db/migrate/20150818213832_add_sent_notifications.rb
>+%%WWWDIR%%/db/migrate/20150824002011_add_enable_ssl_verification.rb
>+%%WWWDIR%%/db/migrate/20150826001931_add_ci_tables.rb
>+%%WWWDIR%%/db/migrate/20150902001023_add_template_to_label.rb
>+%%WWWDIR%%/db/migrate/20150914215247_add_ci_tags.rb
>+%%WWWDIR%%/db/migrate/20150915001905_enable_ssl_verification_by_default.rb
>+%%WWWDIR%%/db/migrate/20150916000405_enable_ssl_verification_for_web_hooks.rb
>+%%WWWDIR%%/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb
>+%%WWWDIR%%/db/migrate/20150916145038_add_index_for_committed_at_and_id.rb
>+%%WWWDIR%%/db/migrate/20150918084513_add_ci_enabled_to_application_settings.rb
>+%%WWWDIR%%/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb
>+%%WWWDIR%%/db/migrate/20150920010715_add_consumed_timestep_to_users.rb
>+%%WWWDIR%%/db/migrate/20150920161119_add_line_code_to_sent_notification.rb
> %%WWWDIR%%/db/migrate/limits_to_mysql.rb
> %%WWWDIR%%/db/schema.rb
> %%WWWDIR%%/db/seeds.rb
>@@ -1308,6 +1533,7 @@
> %%WWWDIR%%/doc/api/deploy_keys.md
> %%WWWDIR%%/doc/api/groups.md
> %%WWWDIR%%/doc/api/issues.md
>+%%WWWDIR%%/doc/api/keys.md
> %%WWWDIR%%/doc/api/labels.md
> %%WWWDIR%%/doc/api/merge_requests.md
> %%WWWDIR%%/doc/api/milestones.md
>@@ -1323,6 +1549,34 @@
> %%WWWDIR%%/doc/api/settings.md
> %%WWWDIR%%/doc/api/system_hooks.md
> %%WWWDIR%%/doc/api/users.md
>+%%WWWDIR%%/doc/ci/README.md
>+%%WWWDIR%%/doc/ci/api/README.md
>+%%WWWDIR%%/doc/ci/api/builds.md
>+%%WWWDIR%%/doc/ci/api/commits.md
>+%%WWWDIR%%/doc/ci/api/projects.md
>+%%WWWDIR%%/doc/ci/api/runners.md
>+%%WWWDIR%%/doc/ci/deployment/README.md
>+%%WWWDIR%%/doc/ci/docker/README.md
>+%%WWWDIR%%/doc/ci/docker/using_docker_build.md
>+%%WWWDIR%%/doc/ci/docker/using_docker_images.md
>+%%WWWDIR%%/doc/ci/examples/README.md
>+%%WWWDIR%%/doc/ci/examples/test-and-deploy-python-application-to-heroku.md
>+%%WWWDIR%%/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
>+%%WWWDIR%%/doc/ci/examples/test-clojure-application.md
>+%%WWWDIR%%/doc/ci/permissions/README.md
>+%%WWWDIR%%/doc/ci/quick_start/README.md
>+%%WWWDIR%%/doc/ci/quick_start/build_status.png
>+%%WWWDIR%%/doc/ci/quick_start/commit_status.png
>+%%WWWDIR%%/doc/ci/quick_start/new_commit.png
>+%%WWWDIR%%/doc/ci/quick_start/projects.png
>+%%WWWDIR%%/doc/ci/quick_start/runners.png
>+%%WWWDIR%%/doc/ci/quick_start/runners_activated.png
>+%%WWWDIR%%/doc/ci/runners/README.md
>+%%WWWDIR%%/doc/ci/runners/project_specific.png
>+%%WWWDIR%%/doc/ci/runners/shared_runner.png
>+%%WWWDIR%%/doc/ci/runners/shared_to_specific_admin.png
>+%%WWWDIR%%/doc/ci/variables/README.md
>+%%WWWDIR%%/doc/ci/yaml/README.md
> %%WWWDIR%%/doc/customization/issue_closing.md
> %%WWWDIR%%/doc/customization/libravatar.md
> %%WWWDIR%%/doc/customization/welcome_message.md
>@@ -1395,6 +1649,8 @@
> %%WWWDIR%%/doc/gitlab-basics/fork-project.md
> %%WWWDIR%%/doc/gitlab-basics/start-using-git.md
> %%WWWDIR%%/doc/hooks/custom_hooks.md
>+%%WWWDIR%%/doc/incoming_email/README.md
>+%%WWWDIR%%/doc/incoming_email/postfix.md
> %%WWWDIR%%/doc/install/README.md
> %%WWWDIR%%/doc/install/database_mysql.md
> %%WWWDIR%%/doc/install/installation.md
>@@ -1402,11 +1658,14 @@
> %%WWWDIR%%/doc/install/structure.md
> %%WWWDIR%%/doc/integration/README.md
> %%WWWDIR%%/doc/integration/bitbucket.md
>+%%WWWDIR%%/doc/integration/crowd.md
> %%WWWDIR%%/doc/integration/external-issue-tracker.md
> %%WWWDIR%%/doc/integration/github.md
> %%WWWDIR%%/doc/integration/github_app.png
> %%WWWDIR%%/doc/integration/gitlab.md
> %%WWWDIR%%/doc/integration/gitlab_app.png
>+%%WWWDIR%%/doc/integration/gmail_action_buttons_for_gitlab.md
>+%%WWWDIR%%/doc/integration/gmail_actions_button.png
> %%WWWDIR%%/doc/integration/google.md
> %%WWWDIR%%/doc/integration/google_app.png
> %%WWWDIR%%/doc/integration/jira-integration-points.png
>@@ -1430,6 +1689,7 @@
> %%WWWDIR%%/doc/legal/individual_contributor_license_agreement.md
> %%WWWDIR%%/doc/logs/logs.md
> %%WWWDIR%%/doc/markdown/markdown.md
>+%%WWWDIR%%/doc/migrate_ci_to_ce/README.md
> %%WWWDIR%%/doc/operations/README.md
> %%WWWDIR%%/doc/operations/cleaning_up_redis_sessions.md
> %%WWWDIR%%/doc/operations/sidekiq_memory_killer.md
>@@ -1500,6 +1760,7 @@
> %%WWWDIR%%/doc/update/7.11-to-7.12.md
> %%WWWDIR%%/doc/update/7.12-to-7.13.md
> %%WWWDIR%%/doc/update/7.13-to-7.14.md
>+%%WWWDIR%%/doc/update/7.14-to-8.0.md
> %%WWWDIR%%/doc/update/7.2-to-7.3.md
> %%WWWDIR%%/doc/update/7.3-to-7.4.md
> %%WWWDIR%%/doc/update/7.4-to-7.5.md
>@@ -1512,6 +1773,7 @@
> %%WWWDIR%%/doc/update/mysql_to_postgresql.md
> %%WWWDIR%%/doc/update/patch_versions.md
> %%WWWDIR%%/doc/update/upgrader.md
>+%%WWWDIR%%/doc/web_hooks/ssl.png
> %%WWWDIR%%/doc/web_hooks/web_hooks.md
> %%WWWDIR%%/doc/workflow/README.md
> %%WWWDIR%%/doc/workflow/add-user/add-user.md
>@@ -1549,11 +1811,17 @@
> %%WWWDIR%%/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.png
> %%WWWDIR%%/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.png
> %%WWWDIR%%/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png
>+%%WWWDIR%%/doc/workflow/importing/fogbugz_importer/fogbugz_import_finished.png
>+%%WWWDIR%%/doc/workflow/importing/fogbugz_importer/fogbugz_import_login.png
>+%%WWWDIR%%/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_fogbogz.png
>+%%WWWDIR%%/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_project.png
>+%%WWWDIR%%/doc/workflow/importing/fogbugz_importer/fogbugz_import_user_map.png
> %%WWWDIR%%/doc/workflow/importing/github_importer/importer.png
> %%WWWDIR%%/doc/workflow/importing/github_importer/new_project_page.png
> %%WWWDIR%%/doc/workflow/importing/gitlab_importer/importer.png
> %%WWWDIR%%/doc/workflow/importing/gitlab_importer/new_project_page.png
> %%WWWDIR%%/doc/workflow/importing/import_projects_from_bitbucket.md
>+%%WWWDIR%%/doc/workflow/importing/import_projects_from_fogbugz.md
> %%WWWDIR%%/doc/workflow/importing/import_projects_from_github.md
> %%WWWDIR%%/doc/workflow/importing/import_projects_from_gitlab_com.md
> %%WWWDIR%%/doc/workflow/importing/migrating_from_svn.md
>@@ -1563,6 +1831,7 @@
> %%WWWDIR%%/doc/workflow/labels/label3.png
> %%WWWDIR%%/doc/workflow/merge_commits.png
> %%WWWDIR%%/doc/workflow/merge_request.png
>+%%WWWDIR%%/doc/workflow/merge_requests.md
> %%WWWDIR%%/doc/workflow/messy_flow.png
> %%WWWDIR%%/doc/workflow/mr_inline_comments.png
> %%WWWDIR%%/doc/workflow/notifications.md
>@@ -1604,6 +1873,8 @@
> %%WWWDIR%%/features/admin/broadcast_messages.feature
> %%WWWDIR%%/features/admin/deploy_keys.feature
> %%WWWDIR%%/features/admin/groups.feature
>+%%WWWDIR%%/features/admin/hooks.feature
>+%%WWWDIR%%/features/admin/labels.feature
> %%WWWDIR%%/features/admin/logs.feature
> %%WWWDIR%%/features/admin/projects.feature
> %%WWWDIR%%/features/admin/settings.feature
>@@ -1623,6 +1894,7 @@
> %%WWWDIR%%/features/explore/projects.feature
> %%WWWDIR%%/features/groups.feature
> %%WWWDIR%%/features/invites.feature
>+%%WWWDIR%%/features/login_form.feature
> %%WWWDIR%%/features/profile/active_tab.feature
> %%WWWDIR%%/features/profile/emails.feature
> %%WWWDIR%%/features/profile/notifications.feature
>@@ -1673,6 +1945,8 @@
> %%WWWDIR%%/features/steps/admin/broadcast_messages.rb
> %%WWWDIR%%/features/steps/admin/deploy_keys.rb
> %%WWWDIR%%/features/steps/admin/groups.rb
>+%%WWWDIR%%/features/steps/admin/hooks.rb
>+%%WWWDIR%%/features/steps/admin/labels.rb
> %%WWWDIR%%/features/steps/admin/logs.rb
> %%WWWDIR%%/features/steps/admin/projects.rb
> %%WWWDIR%%/features/steps/admin/settings.rb
>@@ -1692,6 +1966,7 @@
> %%WWWDIR%%/features/steps/explore/projects.rb
> %%WWWDIR%%/features/steps/groups.rb
> %%WWWDIR%%/features/steps/invites.rb
>+%%WWWDIR%%/features/steps/login_form.rb
> %%WWWDIR%%/features/steps/profile/active_tab.rb
> %%WWWDIR%%/features/steps/profile/emails.rb
> %%WWWDIR%%/features/steps/profile/notifications.rb
>@@ -1767,6 +2042,7 @@
> %%WWWDIR%%/lib/api/helpers.rb
> %%WWWDIR%%/lib/api/internal.rb
> %%WWWDIR%%/lib/api/issues.rb
>+%%WWWDIR%%/lib/api/keys.rb
> %%WWWDIR%%/lib/api/labels.rb
> %%WWWDIR%%/lib/api/merge_requests.rb
> %%WWWDIR%%/lib/api/milestones.rb
>@@ -1782,10 +2058,33 @@
> %%WWWDIR%%/lib/api/settings.rb
> %%WWWDIR%%/lib/api/system_hooks.rb
> %%WWWDIR%%/lib/api/users.rb
>+%%WWWDIR%%/lib/backup/builds.rb
> %%WWWDIR%%/lib/backup/database.rb
> %%WWWDIR%%/lib/backup/manager.rb
> %%WWWDIR%%/lib/backup/repository.rb
> %%WWWDIR%%/lib/backup/uploads.rb
>+%%WWWDIR%%/lib/ci/ansi2html.rb
>+%%WWWDIR%%/lib/ci/api/api.rb
>+%%WWWDIR%%/lib/ci/api/builds.rb
>+%%WWWDIR%%/lib/ci/api/commits.rb
>+%%WWWDIR%%/lib/ci/api/entities.rb
>+%%WWWDIR%%/lib/ci/api/helpers.rb
>+%%WWWDIR%%/lib/ci/api/projects.rb
>+%%WWWDIR%%/lib/ci/api/runners.rb
>+%%WWWDIR%%/lib/ci/api/triggers.rb
>+%%WWWDIR%%/lib/ci/charts.rb
>+%%WWWDIR%%/lib/ci/current_settings.rb
>+%%WWWDIR%%/lib/ci/git.rb
>+%%WWWDIR%%/lib/ci/gitlab_ci_yaml_processor.rb
>+%%WWWDIR%%/lib/ci/migrate/builds.rb
>+%%WWWDIR%%/lib/ci/migrate/database.rb
>+%%WWWDIR%%/lib/ci/migrate/manager.rb
>+%%WWWDIR%%/lib/ci/migrate/tags.rb
>+%%WWWDIR%%/lib/ci/model.rb
>+%%WWWDIR%%/lib/ci/project_list_builder.rb
>+%%WWWDIR%%/lib/ci/scheduler.rb
>+%%WWWDIR%%/lib/ci/static_model.rb
>+%%WWWDIR%%/lib/ci/version_info.rb
> %%WWWDIR%%/lib/disable_email_interceptor.rb
> %%WWWDIR%%/lib/email_validator.rb
> %%WWWDIR%%/lib/event_filter.rb
>@@ -1808,6 +2107,7 @@
> %%WWWDIR%%/lib/gitlab/bitbucket_import/project_creator.rb
> %%WWWDIR%%/lib/gitlab/blacklist.rb
> %%WWWDIR%%/lib/gitlab/closing_issue_extractor.rb
>+%%WWWDIR%%/lib/gitlab/color_schemes.rb
> %%WWWDIR%%/lib/gitlab/compare_result.rb
> %%WWWDIR%%/lib/gitlab/config_helper.rb
> %%WWWDIR%%/lib/gitlab/contributions_calendar.rb
>@@ -1817,8 +2117,16 @@
> %%WWWDIR%%/lib/gitlab/diff/line.rb
> %%WWWDIR%%/lib/gitlab/diff/line_code.rb
> %%WWWDIR%%/lib/gitlab/diff/parser.rb
>+%%WWWDIR%%/lib/gitlab/email/attachment_uploader.rb
>+%%WWWDIR%%/lib/gitlab/email/receiver.rb
>+%%WWWDIR%%/lib/gitlab/email/reply_parser.rb
>+%%WWWDIR%%/lib/gitlab/fogbugz_import/client.rb
>+%%WWWDIR%%/lib/gitlab/fogbugz_import/importer.rb
>+%%WWWDIR%%/lib/gitlab/fogbugz_import/project_creator.rb
>+%%WWWDIR%%/lib/gitlab/fogbugz_import/repository.rb
> %%WWWDIR%%/lib/gitlab/force_push_check.rb
> %%WWWDIR%%/lib/gitlab/git.rb
>+%%WWWDIR%%/lib/gitlab/git/hook.rb
> %%WWWDIR%%/lib/gitlab/git_access.rb
> %%WWWDIR%%/lib/gitlab/git_access_status.rb
> %%WWWDIR%%/lib/gitlab/git_access_wiki.rb
>@@ -1841,11 +2149,14 @@
> %%WWWDIR%%/lib/gitlab/graphs/commits.rb
> %%WWWDIR%%/lib/gitlab/identifier.rb
> %%WWWDIR%%/lib/gitlab/import_formatter.rb
>+%%WWWDIR%%/lib/gitlab/import_sources.rb
>+%%WWWDIR%%/lib/gitlab/incoming_email.rb
> %%WWWDIR%%/lib/gitlab/inline_diff.rb
> %%WWWDIR%%/lib/gitlab/issues_labels.rb
> %%WWWDIR%%/lib/gitlab/key_fingerprint.rb
> %%WWWDIR%%/lib/gitlab/ldap/access.rb
> %%WWWDIR%%/lib/gitlab/ldap/adapter.rb
>+%%WWWDIR%%/lib/gitlab/ldap/auth_hash.rb
> %%WWWDIR%%/lib/gitlab/ldap/authentication.rb
> %%WWWDIR%%/lib/gitlab/ldap/config.rb
> %%WWWDIR%%/lib/gitlab/ldap/person.rb
>@@ -1866,6 +2177,7 @@
> %%WWWDIR%%/lib/gitlab/markdown/relative_link_filter.rb
> %%WWWDIR%%/lib/gitlab/markdown/sanitization_filter.rb
> %%WWWDIR%%/lib/gitlab/markdown/snippet_reference_filter.rb
>+%%WWWDIR%%/lib/gitlab/markdown/syntax_highlight_filter.rb
> %%WWWDIR%%/lib/gitlab/markdown/table_of_contents_filter.rb
> %%WWWDIR%%/lib/gitlab/markdown/task_list_filter.rb
> %%WWWDIR%%/lib/gitlab/markdown/user_reference_filter.rb
>@@ -1881,15 +2193,6 @@
> %%WWWDIR%%/lib/gitlab/push_data_builder.rb
> %%WWWDIR%%/lib/gitlab/reference_extractor.rb
> %%WWWDIR%%/lib/gitlab/regex.rb
>-%%WWWDIR%%/lib/gitlab/satellite/action.rb
>-%%WWWDIR%%/lib/gitlab/satellite/compare_action.rb
>-%%WWWDIR%%/lib/gitlab/satellite/files/delete_file_action.rb
>-%%WWWDIR%%/lib/gitlab/satellite/files/edit_file_action.rb
>-%%WWWDIR%%/lib/gitlab/satellite/files/file_action.rb
>-%%WWWDIR%%/lib/gitlab/satellite/files/new_file_action.rb
>-%%WWWDIR%%/lib/gitlab/satellite/logger.rb
>-%%WWWDIR%%/lib/gitlab/satellite/merge_action.rb
>-%%WWWDIR%%/lib/gitlab/satellite/satellite.rb
> %%WWWDIR%%/lib/gitlab/search_results.rb
> %%WWWDIR%%/lib/gitlab/seeder.rb
> %%WWWDIR%%/lib/gitlab/sidekiq_logger.rb
>@@ -1905,7 +2208,6 @@
> %%WWWDIR%%/lib/gitlab/visibility_level.rb
> %%WWWDIR%%/lib/gt_one_coercion.rb
> %%WWWDIR%%/lib/omni_auth/request_forgery_protection.rb
>-%%WWWDIR%%/lib/redcarpet/render/gitlab_html.rb
> %%WWWDIR%%/lib/repository_cache.rb
> %%WWWDIR%%/lib/rouge/formatters/html_gitlab.rb
> %%WWWDIR%%/lib/static_model.rb
>@@ -1915,14 +2217,17 @@
> %%WWWDIR%%/lib/support/logrotate/gitlab
> %%WWWDIR%%/lib/support/nginx/gitlab
> %%WWWDIR%%/lib/support/nginx/gitlab-ssl
>+%%WWWDIR%%/lib/support/nginx/gitlab_ci
> %%WWWDIR%%/lib/tasks/brakeman.rake
> %%WWWDIR%%/lib/tasks/cache.rake
>+%%WWWDIR%%/lib/tasks/ci/cleanup.rake
>+%%WWWDIR%%/lib/tasks/ci/migrate.rake
>+%%WWWDIR%%/lib/tasks/ci/schedule_builds.rake
> %%WWWDIR%%/lib/tasks/dev.rake
> %%WWWDIR%%/lib/tasks/gitlab/backup.rake
> %%WWWDIR%%/lib/tasks/gitlab/bulk_add_permission.rake
> %%WWWDIR%%/lib/tasks/gitlab/check.rake
> %%WWWDIR%%/lib/tasks/gitlab/cleanup.rake
>-%%WWWDIR%%/lib/tasks/gitlab/enable_automerge.rake
> %%WWWDIR%%/lib/tasks/gitlab/generate_docs.rake
> %%WWWDIR%%/lib/tasks/gitlab/import.rake
> %%WWWDIR%%/lib/tasks/gitlab/info.rake
>@@ -1936,6 +2241,7 @@
> %%WWWDIR%%/lib/tasks/migrate/add_limits_mysql.rake
> %%WWWDIR%%/lib/tasks/migrate/migrate_iids.rake
> %%WWWDIR%%/lib/tasks/rubocop.rake
>+%%WWWDIR%%/lib/tasks/services.rake
> %%WWWDIR%%/lib/tasks/setup.rake
> %%WWWDIR%%/lib/tasks/sidekiq.rake
> %%WWWDIR%%/lib/tasks/spec.rake
>@@ -1949,11 +2255,20 @@
> %%WWWDIR%%/public/502.html
> %%WWWDIR%%/public/apple-touch-icon-precomposed.png
> %%WWWDIR%%/public/apple-touch-icon.png
>+%%WWWDIR%%/public/ci/build-canceled.svg
>+%%WWWDIR%%/public/ci/build-failed.svg
>+%%WWWDIR%%/public/ci/build-pending.svg
>+%%WWWDIR%%/public/ci/build-running.svg
>+%%WWWDIR%%/public/ci/build-skipped.svg
>+%%WWWDIR%%/public/ci/build-success.svg
>+%%WWWDIR%%/public/ci/build-unknown.svg
>+%%WWWDIR%%/public/ci/favicon.ico
> %%WWWDIR%%/public/deploy.html
> %%WWWDIR%%/public/favicon.ico
> %%WWWDIR%%/public/logo.svg
> %%WWWDIR%%/public/robots.txt
> %%WWWDIR%%/public/static.css
>+%%WWWDIR%%/scripts/ci/prepare_build.sh
> %%WWWDIR%%/scripts/prepare_build.sh
> %%WWWDIR%%/spec/controllers/admin/users_controller_spec.rb
> %%WWWDIR%%/spec/controllers/application_controller_spec.rb
>@@ -1961,11 +2276,14 @@
> %%WWWDIR%%/spec/controllers/blame_controller_spec.rb
> %%WWWDIR%%/spec/controllers/blob_controller_spec.rb
> %%WWWDIR%%/spec/controllers/branches_controller_spec.rb
>+%%WWWDIR%%/spec/controllers/ci/commits_controller_spec.rb
>+%%WWWDIR%%/spec/controllers/ci/projects_controller_spec.rb
> %%WWWDIR%%/spec/controllers/commit_controller_spec.rb
> %%WWWDIR%%/spec/controllers/commits_controller_spec.rb
> %%WWWDIR%%/spec/controllers/groups/avatars_controller_spec.rb
> %%WWWDIR%%/spec/controllers/help_controller_spec.rb
> %%WWWDIR%%/spec/controllers/import/bitbucket_controller_spec.rb
>+%%WWWDIR%%/spec/controllers/import/fogbugz_controller_spec.rb
> %%WWWDIR%%/spec/controllers/import/github_controller_spec.rb
> %%WWWDIR%%/spec/controllers/import/gitlab_controller_spec.rb
> %%WWWDIR%%/spec/controllers/import/gitorious_controller_spec.rb
>@@ -1982,6 +2300,7 @@
> %%WWWDIR%%/spec/controllers/projects/merge_requests_controller_spec.rb
> %%WWWDIR%%/spec/controllers/projects/milestones_controller_spec.rb
> %%WWWDIR%%/spec/controllers/projects/protected_branches_controller_spec.rb
>+%%WWWDIR%%/spec/controllers/projects/raw_controller_spec.rb
> %%WWWDIR%%/spec/controllers/projects/refs_controller_spec.rb
> %%WWWDIR%%/spec/controllers/projects/repositories_controller_spec.rb
> %%WWWDIR%%/spec/controllers/projects/services_controller_spec.rb
>@@ -1994,6 +2313,15 @@
> %%WWWDIR%%/spec/factories.rb
> %%WWWDIR%%/spec/factories/abuse_reports.rb
> %%WWWDIR%%/spec/factories/broadcast_messages.rb
>+%%WWWDIR%%/spec/factories/ci/builds.rb
>+%%WWWDIR%%/spec/factories/ci/commits.rb
>+%%WWWDIR%%/spec/factories/ci/events.rb
>+%%WWWDIR%%/spec/factories/ci/projects.rb
>+%%WWWDIR%%/spec/factories/ci/runner_projects.rb
>+%%WWWDIR%%/spec/factories/ci/runners.rb
>+%%WWWDIR%%/spec/factories/ci/trigger_requests.rb
>+%%WWWDIR%%/spec/factories/ci/triggers.rb
>+%%WWWDIR%%/spec/factories/ci/web_hook.rb
> %%WWWDIR%%/spec/factories/forked_project_links.rb
> %%WWWDIR%%/spec/factories/group_members.rb
> %%WWWDIR%%/spec/factories/label_links.rb
>@@ -2010,6 +2338,18 @@
> %%WWWDIR%%/spec/features/atom/dashboard_spec.rb
> %%WWWDIR%%/spec/features/atom/issues_spec.rb
> %%WWWDIR%%/spec/features/atom/users_spec.rb
>+%%WWWDIR%%/spec/features/ci/admin/builds_spec.rb
>+%%WWWDIR%%/spec/features/ci/admin/events_spec.rb
>+%%WWWDIR%%/spec/features/ci/admin/projects_spec.rb
>+%%WWWDIR%%/spec/features/ci/admin/runners_spec.rb
>+%%WWWDIR%%/spec/features/ci/builds_spec.rb
>+%%WWWDIR%%/spec/features/ci/commits_spec.rb
>+%%WWWDIR%%/spec/features/ci/events_spec.rb
>+%%WWWDIR%%/spec/features/ci/lint_spec.rb
>+%%WWWDIR%%/spec/features/ci/projects_spec.rb
>+%%WWWDIR%%/spec/features/ci/runners_spec.rb
>+%%WWWDIR%%/spec/features/ci/triggers_spec.rb
>+%%WWWDIR%%/spec/features/ci/variables_spec.rb
> %%WWWDIR%%/spec/features/gitlab_flavored_markdown_spec.rb
> %%WWWDIR%%/spec/features/groups_spec.rb
> %%WWWDIR%%/spec/features/help_pages_spec.rb
>@@ -2042,6 +2382,23 @@
> %%WWWDIR%%/spec/fixtures/banana_sample.gif
> %%WWWDIR%%/spec/fixtures/dk.png
> %%WWWDIR%%/spec/fixtures/doc_sample.txt
>+%%WWWDIR%%/spec/fixtures/emails/android_gmail.eml
>+%%WWWDIR%%/spec/fixtures/emails/attachment.eml
>+%%WWWDIR%%/spec/fixtures/emails/auto_reply.eml
>+%%WWWDIR%%/spec/fixtures/emails/dutch.eml
>+%%WWWDIR%%/spec/fixtures/emails/gmail_web.eml
>+%%WWWDIR%%/spec/fixtures/emails/html_paragraphs.eml
>+%%WWWDIR%%/spec/fixtures/emails/inline_reply.eml
>+%%WWWDIR%%/spec/fixtures/emails/ios_default.eml
>+%%WWWDIR%%/spec/fixtures/emails/newlines.eml
>+%%WWWDIR%%/spec/fixtures/emails/no_content_reply.eml
>+%%WWWDIR%%/spec/fixtures/emails/on_wrote.eml
>+%%WWWDIR%%/spec/fixtures/emails/outlook.eml
>+%%WWWDIR%%/spec/fixtures/emails/paragraphs.eml
>+%%WWWDIR%%/spec/fixtures/emails/plaintext_only.eml
>+%%WWWDIR%%/spec/fixtures/emails/valid_reply.eml
>+%%WWWDIR%%/spec/fixtures/emails/windows_8_metro.eml
>+%%WWWDIR%%/spec/fixtures/emails/wrong_reply_key.eml
> %%WWWDIR%%/spec/fixtures/markdown.md.erb
> %%WWWDIR%%/spec/fixtures/rails_sample.jpg
> %%WWWDIR%%/spec/helpers/application_helper_spec.rb
>@@ -2048,10 +2405,13 @@
> %%WWWDIR%%/spec/helpers/auth_helper_spec.rb
> %%WWWDIR%%/spec/helpers/blob_helper_spec.rb
> %%WWWDIR%%/spec/helpers/broadcast_messages_helper_spec.rb
>+%%WWWDIR%%/spec/helpers/ci/application_helper_spec.rb
>+%%WWWDIR%%/spec/helpers/ci/runners_helper_spec.rb
> %%WWWDIR%%/spec/helpers/diff_helper_spec.rb
> %%WWWDIR%%/spec/helpers/emails_helper_spec.rb
> %%WWWDIR%%/spec/helpers/events_helper_spec.rb
> %%WWWDIR%%/spec/helpers/gitlab_markdown_helper_spec.rb
>+%%WWWDIR%%/spec/helpers/graph_helper_spec.rb
> %%WWWDIR%%/spec/helpers/groups_helper.rb
> %%WWWDIR%%/spec/helpers/icons_helper_spec.rb
> %%WWWDIR%%/spec/helpers/issues_helper_spec.rb
>@@ -2087,7 +2447,11 @@
> %%WWWDIR%%/spec/javascripts/stat_graph_contributors_graph_spec.js
> %%WWWDIR%%/spec/javascripts/stat_graph_contributors_util_spec.js
> %%WWWDIR%%/spec/javascripts/stat_graph_spec.js
>+%%WWWDIR%%/spec/javascripts/syntax_highlight_spec.js.coffee
> %%WWWDIR%%/spec/javascripts/zen_mode_spec.js.coffee
>+%%WWWDIR%%/spec/lib/ci/ansi2html_spec.rb
>+%%WWWDIR%%/spec/lib/ci/charts_spec.rb
>+%%WWWDIR%%/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
> %%WWWDIR%%/spec/lib/disable_email_interceptor_spec.rb
> %%WWWDIR%%/spec/lib/extracts_path_spec.rb
> %%WWWDIR%%/spec/lib/file_size_validator_spec.rb
>@@ -2099,9 +2463,13 @@
> %%WWWDIR%%/spec/lib/gitlab/bitbucket_import/client_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/closing_issue_extractor_spec.rb
>+%%WWWDIR%%/spec/lib/gitlab/color_schemes_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/diff/file_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/diff/parser_spec.rb
>+%%WWWDIR%%/spec/lib/gitlab/email/attachment_uploader_spec.rb
>+%%WWWDIR%%/spec/lib/gitlab/email/receiver_spec.rb
>+%%WWWDIR%%/spec/lib/gitlab/email/reply_parser_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/git_access_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/git_access_wiki_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/github_import/client_spec.rb
>@@ -2112,9 +2480,11 @@
> %%WWWDIR%%/spec/lib/gitlab/google_code_import/client_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/google_code_import/importer_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/google_code_import/project_creator_spec.rb
>+%%WWWDIR%%/spec/lib/gitlab/incoming_email_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/key_fingerprint_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/ldap/access_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/ldap/adapter_spec.rb
>+%%WWWDIR%%/spec/lib/gitlab/ldap/auth_hash_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/ldap/authentication_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/ldap/config_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/ldap/user_spec.rb
>@@ -2131,6 +2501,7 @@
> %%WWWDIR%%/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
>+%%WWWDIR%%/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/markdown/task_list_filter_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
>@@ -2143,8 +2514,6 @@
> %%WWWDIR%%/spec/lib/gitlab/push_data_builder_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/reference_extractor_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/regex_spec.rb
>-%%WWWDIR%%/spec/lib/gitlab/satellite/action_spec.rb
>-%%WWWDIR%%/spec/lib/gitlab/satellite/merge_action_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/themes_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/upgrader_spec.rb
> %%WWWDIR%%/spec/lib/gitlab/url_builder_spec.rb
>@@ -2151,10 +2520,25 @@
> %%WWWDIR%%/spec/lib/gitlab/version_info_spec.rb
> %%WWWDIR%%/spec/lib/repository_cache_spec.rb
> %%WWWDIR%%/spec/lib/votes_spec.rb
>+%%WWWDIR%%/spec/mailers/ci/notify_spec.rb
> %%WWWDIR%%/spec/mailers/notify_spec.rb
> %%WWWDIR%%/spec/models/abuse_report_spec.rb
> %%WWWDIR%%/spec/models/application_setting_spec.rb
> %%WWWDIR%%/spec/models/broadcast_message_spec.rb
>+%%WWWDIR%%/spec/models/ci/build_spec.rb
>+%%WWWDIR%%/spec/models/ci/commit_spec.rb
>+%%WWWDIR%%/spec/models/ci/mail_service_spec.rb
>+%%WWWDIR%%/spec/models/ci/project_services/hip_chat_message_spec.rb
>+%%WWWDIR%%/spec/models/ci/project_services/hip_chat_service_spec.rb
>+%%WWWDIR%%/spec/models/ci/project_services/slack_message_spec.rb
>+%%WWWDIR%%/spec/models/ci/project_services/slack_service_spec.rb
>+%%WWWDIR%%/spec/models/ci/project_spec.rb
>+%%WWWDIR%%/spec/models/ci/runner_project_spec.rb
>+%%WWWDIR%%/spec/models/ci/runner_spec.rb
>+%%WWWDIR%%/spec/models/ci/service_spec.rb
>+%%WWWDIR%%/spec/models/ci/trigger_spec.rb
>+%%WWWDIR%%/spec/models/ci/variable_spec.rb
>+%%WWWDIR%%/spec/models/ci/web_hook_spec.rb
> %%WWWDIR%%/spec/models/commit_range_spec.rb
> %%WWWDIR%%/spec/models/commit_spec.rb
> %%WWWDIR%%/spec/models/concerns/issuable_spec.rb
>@@ -2185,6 +2569,7 @@
> %%WWWDIR%%/spec/models/project_services/asana_service_spec.rb
> %%WWWDIR%%/spec/models/project_services/assembla_service_spec.rb
> %%WWWDIR%%/spec/models/project_services/buildkite_service_spec.rb
>+%%WWWDIR%%/spec/models/project_services/drone_ci_service_spec.rb
> %%WWWDIR%%/spec/models/project_services/flowdock_service_spec.rb
> %%WWWDIR%%/spec/models/project_services/gemnasium_service_spec.rb
> %%WWWDIR%%/spec/models/project_services/gitlab_ci_service_spec.rb
>@@ -2219,6 +2604,7 @@
> %%WWWDIR%%/spec/requests/api/groups_spec.rb
> %%WWWDIR%%/spec/requests/api/internal_spec.rb
> %%WWWDIR%%/spec/requests/api/issues_spec.rb
>+%%WWWDIR%%/spec/requests/api/keys_spec.rb
> %%WWWDIR%%/spec/requests/api/labels_spec.rb
> %%WWWDIR%%/spec/requests/api/merge_requests_spec.rb
> %%WWWDIR%%/spec/requests/api/milestones_spec.rb
>@@ -2233,11 +2619,25 @@
> %%WWWDIR%%/spec/requests/api/settings_spec.rb
> %%WWWDIR%%/spec/requests/api/system_hooks_spec.rb
> %%WWWDIR%%/spec/requests/api/users_spec.rb
>+%%WWWDIR%%/spec/requests/ci/api/builds_spec.rb
>+%%WWWDIR%%/spec/requests/ci/api/commits_spec.rb
>+%%WWWDIR%%/spec/requests/ci/api/projects_spec.rb
>+%%WWWDIR%%/spec/requests/ci/api/runners_spec.rb
>+%%WWWDIR%%/spec/requests/ci/api/triggers_spec.rb
>+%%WWWDIR%%/spec/requests/ci/builds_spec.rb
>+%%WWWDIR%%/spec/requests/ci/commits_spec.rb
> %%WWWDIR%%/spec/routing/admin_routing_spec.rb
> %%WWWDIR%%/spec/routing/notifications_routing_spec.rb
> %%WWWDIR%%/spec/routing/project_routing_spec.rb
> %%WWWDIR%%/spec/routing/routing_spec.rb
> %%WWWDIR%%/spec/services/archive_repository_service_spec.rb
>+%%WWWDIR%%/spec/services/ci/create_commit_service_spec.rb
>+%%WWWDIR%%/spec/services/ci/create_project_service_spec.rb
>+%%WWWDIR%%/spec/services/ci/create_trigger_request_service_spec.rb
>+%%WWWDIR%%/spec/services/ci/event_service_spec.rb
>+%%WWWDIR%%/spec/services/ci/image_for_build_service_spec.rb
>+%%WWWDIR%%/spec/services/ci/register_build_service_spec.rb
>+%%WWWDIR%%/spec/services/ci/web_hook_service_spec.rb
> %%WWWDIR%%/spec/services/create_snippet_service_spec.rb
> %%WWWDIR%%/spec/services/destroy_group_service_spec.rb
> %%WWWDIR%%/spec/services/event_create_service_spec.rb
>@@ -2258,6 +2658,7 @@
> %%WWWDIR%%/spec/services/notification_service_spec.rb
> %%WWWDIR%%/spec/services/projects/create_service_spec.rb
> %%WWWDIR%%/spec/services/projects/destroy_service_spec.rb
>+%%WWWDIR%%/spec/services/projects/download_service_spec.rb
> %%WWWDIR%%/spec/services/projects/fork_service_spec.rb
> %%WWWDIR%%/spec/services/projects/transfer_service_spec.rb
> %%WWWDIR%%/spec/services/projects/update_service_spec.rb
>@@ -2274,6 +2675,13 @@
> %%WWWDIR%%/spec/support/db_cleaner.rb
> %%WWWDIR%%/spec/support/factory_girl.rb
> %%WWWDIR%%/spec/support/filter_spec_helper.rb
>+%%WWWDIR%%/spec/support/fixture_helpers.rb
>+%%WWWDIR%%/spec/support/gitlab_stubs/gitlab_ci.yml
>+%%WWWDIR%%/spec/support/gitlab_stubs/project_8.json
>+%%WWWDIR%%/spec/support/gitlab_stubs/project_8_hooks.json
>+%%WWWDIR%%/spec/support/gitlab_stubs/projects.json
>+%%WWWDIR%%/spec/support/gitlab_stubs/session.json
>+%%WWWDIR%%/spec/support/gitlab_stubs/user.json
> %%WWWDIR%%/spec/support/login_helpers.rb
> %%WWWDIR%%/spec/support/markdown_feature.rb
> %%WWWDIR%%/spec/support/matchers/access_matchers.rb
>@@ -2281,9 +2689,14 @@
> %%WWWDIR%%/spec/support/matchers/is_within.rb
> %%WWWDIR%%/spec/support/matchers/markdown_matchers.rb
> %%WWWDIR%%/spec/support/mentionable_shared_examples.rb
>+%%WWWDIR%%/spec/support/relative_url.rb
> %%WWWDIR%%/spec/support/repo_helpers.rb
> %%WWWDIR%%/spec/support/select2_helper.rb
>+%%WWWDIR%%/spec/support/services_shared_context.rb
>+%%WWWDIR%%/spec/support/setup_builds_storage.rb
> %%WWWDIR%%/spec/support/stub_configuration.rb
>+%%WWWDIR%%/spec/support/stub_gitlab_calls.rb
>+%%WWWDIR%%/spec/support/stub_gitlab_data.rb
> %%WWWDIR%%/spec/support/taskable_shared_examples.rb
> %%WWWDIR%%/spec/support/test_env.rb
> %%WWWDIR%%/spec/support/webmock.rb
>@@ -2290,9 +2703,13 @@
> %%WWWDIR%%/spec/tasks/gitlab/backup_rake_spec.rb
> %%WWWDIR%%/spec/tasks/gitlab/mail_google_schema_whitelisting.rb
> %%WWWDIR%%/spec/teaspoon_env.rb
>-%%WWWDIR%%/spec/workers/fork_registration_worker_spec.rb
>+%%WWWDIR%%/spec/views/help/index.html.haml_spec.rb
>+%%WWWDIR%%/spec/workers/email_receiver_worker_spec.rb
>+%%WWWDIR%%/spec/workers/emails_on_push_worker_spec.rb
>+%%WWWDIR%%/spec/workers/merge_worker_spec.rb
> %%WWWDIR%%/spec/workers/post_receive_spec.rb
> %%WWWDIR%%/spec/workers/repository_archive_worker_spec.rb
>+%%WWWDIR%%/spec/workers/repository_fork_worker_spec.rb
> %%WWWDIR%%/vendor/assets/javascripts/chart-lib.min.js
> %%WWWDIR%%/vendor/assets/javascripts/g.bar-min.js
> %%WWWDIR%%/vendor/assets/javascripts/g.raphael-min.js
>@@ -2309,7 +2726,9 @@
> @dir %%WWWDIR%%/app/assets/images/auth_buttons/
> @dir(git,git,554) %%WWWDIR%%/bin
> @dir %%WWWDIR%%/config
>+@dir %%WWWDIR%%/builds
> @dir %%WWWDIR%%/lib/assets
>+@dir %%WWWDIR%%/lib/ci/assets
> @dir %%WWWDIR%%/log
> @dir %%WWWDIR%%/public
> @dir %%WWWDIR%%/public/assets
>Index: Makefile
>===================================================================
>--- Makefile	(.../gitlab)	(Revision 192)
>+++ Makefile	(.../gitlab8)	(Revision 192)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gitlab
>-PORTVERSION=	7.14.3
>+PORTVERSION=	8.0.4
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www devel
> 
>@@ -21,39 +21,39 @@
> 
> RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
> 	redis>=3.0.0:${PORTSDIR}/databases/redis \
>-	rubygem-rails41>=4.1.1:${PORTSDIR}/www/rubygem-rails41 \
>+	rubygem-rails41>=4.1.12:${PORTSDIR}/www/rubygem-rails41 \
> 	rubygem-sprockets>=2.12.3:${PORTSDIR}/devel/rubygem-sprockets \
> 	rubygem-default_value_for-rails41>=3.0.0:${PORTSDIR}/devel/rubygem-default_value_for-rails41 \
> 	rubygem-pg>=0.18.2:${PORTSDIR}/databases/rubygem-pg \
>-	rubygem-devise-rails41>=3.2.4:${PORTSDIR}/devel/rubygem-devise-rails41 \
>+	rubygem-devise-rails41>=3.5.2:${PORTSDIR}/devel/rubygem-devise-rails41 \
> 	rubygem-devise-async-rails41>=0.9.0:${PORTSDIR}/devel/rubygem-devise-async-rails41 \
>-	rubygem-omniauth>=1.1.3:${PORTSDIR}/security/rubygem-omniauth \
>-	rubygem-omniauth-google-oauth2>=0.2.6:${PORTSDIR}/net/rubygem-omniauth-google-oauth2 \
>-	rubygem-omniauth-twitter>=1.2.0:${PORTSDIR}/net/rubygem-omniauth-twitter \
>-	rubygem-omniauth-github>=1.1.2:${PORTSDIR}/net/rubygem-omniauth-github \
>-	rubygem-omniauth-shibboleth>=1.2.1:${PORTSDIR}/security/rubygem-omniauth-shibboleth \
>+	rubygem-omniauth>=1.2.2:${PORTSDIR}/security/rubygem-omniauth \
>+	rubygem-omniauth-google-oauth2>=0.2.5:${PORTSDIR}/net/rubygem-omniauth-google-oauth2 \
>+	rubygem-omniauth-twitter>=1.0.1:${PORTSDIR}/net/rubygem-omniauth-twitter \
>+	rubygem-omniauth-github>=1.1.1:${PORTSDIR}/net/rubygem-omniauth-github \
>+	rubygem-omniauth-shibboleth>=1.1.1:${PORTSDIR}/security/rubygem-omniauth-shibboleth \
> 	rubygem-omniauth-gitlab>=1.0.0:${PORTSDIR}/security/rubygem-omniauth-gitlab \
> 	rubygem-omniauth-bitbucket>=0.0.2:${PORTSDIR}/security/rubygem-omniauth-bitbucket \
>-	rubygem-omniauth-saml>=0.0.1:${PORTSDIR}/security/rubygem-omniauth-saml \
>-	rubygem-doorkeeper-rails41>=2.1.0:${PORTSDIR}/security/rubygem-doorkeeper-rails41 \
>+	rubygem-omniauth-saml>=1.4.0:${PORTSDIR}/security/rubygem-omniauth-saml \
>+	rubygem-doorkeeper-rails41>=2.1.3:${PORTSDIR}/security/rubygem-doorkeeper-rails41 \
>+	rubygem-omniauth_crowd-rails41>=0:${PORTSDIR}/devel/rubygem-omniauth_crowd-rails41 \
> 	rubygem-rack-oauth2-rails41>=1.0.5:${PORTSDIR}/security/rubygem-rack-oauth2-rails41 \
>-	rubygem-devise-two-factor-rails41>=1.0.2:${PORTSDIR}/security/rubygem-devise-two-factor-rails41 \
>+	rubygem-devise-two-factor-rails41>=2.0.0:${PORTSDIR}/security/rubygem-devise-two-factor-rails41 \
> 	rubygem-rqrcode-rails3>=0.1.7:${PORTSDIR}/www/rubygem-rqrcode-rails3 \
> 	rubygem-attr_encrypted>=1.3.4:${PORTSDIR}/security/rubygem-attr_encrypted \
>-	rubygem-browser>=0.8.0:${PORTSDIR}/www/rubygem-browser \
>+	rubygem-browser>=1.0.0:${PORTSDIR}/www/rubygem-browser \
> 	rubygem-gitlab_git-rails41>=7.2.15:${PORTSDIR}/devel/rubygem-gitlab_git-rails41 \
>-	rubygem-gitlab-grack>=2.0.2:${PORTSDIR}/www/rubygem-gitlab-grack \
> 	rubygem-gitlab_omniauth-ldap>=1.2.1:${PORTSDIR}/net/rubygem-gitlab_omniauth-ldap \
> 	rubygem-gollum-lib>=4.0.2:${PORTSDIR}/www/rubygem-gollum-lib \
> 	rubygem-gitlab-linguist>=3.0.1:${PORTSDIR}/textproc/rubygem-gitlab-linguist \
> 	rubygem-grape-rails41>=0.6.1:${PORTSDIR}/devel/rubygem-grape-rails41 \
> 	rubygem-grape-entity-rails41>=0.4.2:${PORTSDIR}/devel/rubygem-grape-entity-rails41 \
>-	rubygem-rack-cors>=0.4.0:${PORTSDIR}/www/rubygem-rack-cors \
>-	rubygem-stamp>=0.6.0:${PORTSDIR}/textproc/rubygem-stamp \
>-	rubygem-enumerize-rails41>=0.11.0:${PORTSDIR}/devel/rubygem-enumerize-rails41 \
>+	rubygem-rack-cors>=0.2.9:${PORTSDIR}/www/rubygem-rack-cors \
>+	rubygem-stamp>=0.5.0:${PORTSDIR}/textproc/rubygem-stamp \
>+	rubygem-enumerize-rails41>=0.7.0:${PORTSDIR}/devel/rubygem-enumerize-rails41 \
> 	rubygem-kaminari-rails41>=0.15.1:${PORTSDIR}/www/rubygem-kaminari-rails41 \
>-	rubygem-haml-rails-rails41>=0.9.0:${PORTSDIR}/www/rubygem-haml-rails-rails41 \
>-	rubygem-carrierwave-rails41>=0.10.0:${PORTSDIR}/www/rubygem-carrierwave-rails41 \
>+	rubygem-haml-rails-rails41>=0.5.3:${PORTSDIR}/www/rubygem-haml-rails-rails41 \
>+	rubygem-carrierwave-rails41>=0.9.0:${PORTSDIR}/www/rubygem-carrierwave-rails41 \
> 	rubygem-dropzonejs-rails41>=0.7.1:${PORTSDIR}/www/rubygem-dropzonejs-rails41 \
> 	rubygem-fog>=1.25:${PORTSDIR}/devel/rubygem-fog \
> 	rubygem-unf>=0.1.4:${PORTSDIR}/textproc/rubygem-unf \
>@@ -61,7 +61,7 @@
> 	rubygem-seed-fu-rails41>=2.3.5:${PORTSDIR}/databases/rubygem-seed-fu-rails41 \
> 	rubygem-html-pipeline-rails41>=1.11.0:${PORTSDIR}/textproc/rubygem-html-pipeline-rails41 \
> 	rubygem-task_list-rails41>=1.0.2:${PORTSDIR}/www/rubygem-task_list-rails41 \
>-	rubygem-github-markup>=1.3.3:${PORTSDIR}/textproc/rubygem-github-markup \
>+	rubygem-github-markup>=1.3.1:${PORTSDIR}/textproc/rubygem-github-markup \
> 	rubygem-redcarpet>=3.3.2:${PORTSDIR}/textproc/rubygem-redcarpet \
> 	rubygem-redcloth>=4.2.9:${PORTSDIR}/www/rubygem-redcloth \
> 	rubygem-rdoc>=3.6:${PORTSDIR}/devel/rubygem-rdoc \
>@@ -70,18 +70,19 @@
> 	rubygem-wikicloth>=0.8.1:${PORTSDIR}/textproc/rubygem-wikicloth \
> 	rubygem-asciidoctor>=1.5.2:${PORTSDIR}/textproc/rubygem-asciidoctor \
> 	rubygem-diffy>=3.0.3:${PORTSDIR}/textproc/rubygem-diffy \
>-	rubygem-unicorn>=4.6.3:${PORTSDIR}/www/rubygem-unicorn \
>-	rubygem-unicorn-worker-killer>=0.4.3:${PORTSDIR}/www/rubygem-unicorn-worker-killer \
>+	rubygem-unicorn>=4.8.2:${PORTSDIR}/www/rubygem-unicorn \
>+	rubygem-unicorn-worker-killer>=0.4.2:${PORTSDIR}/www/rubygem-unicorn-worker-killer \
> 	rubygem-state_machine>=1.2.0:${PORTSDIR}/devel/rubygem-state_machine \
>+	rubygem-after_commit_queue-rails41>=0:${PORTSDIR}/databases/rubygem-after_commit_queue-rails41 \
> 	rubygem-acts-as-taggable-on3-rails41>=3.4.0:${PORTSDIR}/www/rubygem-acts-as-taggable-on3-rails41 \
>-	rubygem-slim>=3.0.4:${PORTSDIR}/devel/rubygem-slim \
>-	rubygem-sinatra>=1.4.6:${PORTSDIR}/www/rubygem-sinatra \
>-	rubygem-sidekiq>=3.3:${PORTSDIR}/devel/rubygem-sidekiq \
>+	rubygem-slim>=2.0.2:${PORTSDIR}/devel/rubygem-slim \
>+	rubygem-sinatra>=1.4.4:${PORTSDIR}/www/rubygem-sinatra \
>+	rubygem-sidekiq>=3.3.0:${PORTSDIR}/devel/rubygem-sidekiq \
> 	rubygem-sidetiq>=0.6.3:${PORTSDIR}/devel/rubygem-sidetiq \
>-	rubygem-httparty>=0.13.5:${PORTSDIR}/www/rubygem-httparty \
>+	rubygem-httparty>=0.13.3:${PORTSDIR}/www/rubygem-httparty \
> 	rubygem-colored>=1.2:${PORTSDIR}/textproc/rubygem-colored \
>+	rubygem-colorize>=0.5.8:${PORTSDIR}/devel/rubygem-colorize \
> 	rubygem-settingslogic>=2.0.9:${PORTSDIR}/devel/rubygem-settingslogic \
>-	rubygem-foreman>=0.78.0:${PORTSDIR}/devel/rubygem-foreman \
> 	rubygem-version_sorter>=2.0.0:${PORTSDIR}/textproc/rubygem-version_sorter \
> 	rubygem-redis-rails41>=4.0.0:${PORTSDIR}/www/rubygem-redis-rails41 \
> 	rubygem-tinder>=1.9.2:${PORTSDIR}/net-im/rubygem-tinder \
>@@ -90,36 +91,46 @@
> 	rubygem-gemnasium-gitlab-service>=0.2:${PORTSDIR}/devel/rubygem-gemnasium-gitlab-service \
> 	rubygem-slack-notifier>=1.0.0:${PORTSDIR}/devel/rubygem-slack-notifier \
> 	rubygem-asana-rails41>=0.0.6:${PORTSDIR}/www/rubygem-asana-rails41 \
>+	rubygem-ruby-fogbugz>=0.2.1:${PORTSDIR}/devel/rubygem-ruby-fogbugz \
> 	rubygem-d3_rails-rails41>=3.5.5:${PORTSDIR}/www/rubygem-d3_rails-rails41 \
> 	rubygem-cal-heatmap-rails0-rails41=0.0.1:${PORTSDIR}/www/rubygem-cal-heatmap-rails0-rails41 \
> 	rubygem-underscore-rails>=1.4.4:${PORTSDIR}/www/rubygem-underscore-rails \
> 	rubygem-sanitize>=2.0:${PORTSDIR}/textproc/rubygem-sanitize \
> 	rubygem-rack-attack>=4.3.0:${PORTSDIR}/www/rubygem-rack-attack \
>-	rubygem-ace-rails-ap>=3.0.3:${PORTSDIR}/www/rubygem-ace-rails-ap \
>+	rubygem-ace-rails-ap>=2.0.1:${PORTSDIR}/www/rubygem-ace-rails-ap \
> 	rubygem-mousetrap-rails>=1.4.6:${PORTSDIR}/www/rubygem-mousetrap-rails \
>-	rubygem-charlock_holmes>=0.7.3:${PORTSDIR}/textproc/rubygem-charlock_holmes \
>+	rubygem-charlock_holmes>=0.6.9.4:${PORTSDIR}/textproc/rubygem-charlock_holmes \
> 	rubygem-sass-rails41>=4.0.5:${PORTSDIR}/textproc/rubygem-sass-rails41 \
> 	rubygem-coffee-rails41>=4.1.0:${PORTSDIR}/devel/rubygem-coffee-rails41 \
>-	rubygem-uglifier>=2.7.1:${PORTSDIR}/www/rubygem-uglifier \
>+	rubygem-uglifier>=2.3.2:${PORTSDIR}/www/rubygem-uglifier \
> 	rubygem-turbolinks-rails41>=2.5.0:${PORTSDIR}/www/rubygem-turbolinks-rails41 \
>-	rubygem-jquery-turbolinks-rails41>=2.1.0:${PORTSDIR}/www/rubygem-jquery-turbolinks-rails41 \
>+	rubygem-jquery-turbolinks-rails41>=2.0.1:${PORTSDIR}/www/rubygem-jquery-turbolinks-rails41 \
> 	rubygem-addressable>=2.3.8:${PORTSDIR}/www/rubygem-addressable \
> 	rubygem-bootstrap-sass>=3.0:${PORTSDIR}/www/rubygem-bootstrap-sass \
> 	rubygem-font-awesome-rails-rails41>=4.2:${PORTSDIR}/devel/rubygem-font-awesome-rails-rails41 \
> 	rubygem-gitlab_emoji>=0.1:${PORTSDIR}/graphics/rubygem-gitlab_emoji \
> 	rubygem-gon-rails41>=5.0.0:${PORTSDIR}/www/rubygem-gon-rails41 \
>-	rubygem-jquery-atwho-rails-rails4>=0.3.3:${PORTSDIR}/www/rubygem-jquery-atwho-rails-rails4 \
>+	rubygem-jquery-atwho-rails-rails4>=1.0.0:${PORTSDIR}/www/rubygem-jquery-atwho-rails-rails4 \
> 	rubygem-jquery-rails-rails41>=3.1.3:${PORTSDIR}/www/rubygem-jquery-rails-rails41 \
> 	rubygem-jquery-scrollto-rails41>=1.4.3:${PORTSDIR}/www/rubygem-jquery-scrollto-rails41 \
>-	rubygem-jquery-ui-rails-rails41>=4.1.2:${PORTSDIR}/www/rubygem-jquery-ui-rails-rails41 \
>-	rubygem-nprogress-rails>=0.1.6.7:${PORTSDIR}/devel/rubygem-nprogress-rails \
>+	rubygem-jquery-ui-rails-rails41>=4.2.1:${PORTSDIR}/www/rubygem-jquery-ui-rails-rails41 \
>+	rubygem-nprogress-rails>=0.1.2.3:${PORTSDIR}/devel/rubygem-nprogress-rails \
> 	rubygem-raphael-rails>=2.1.2:${PORTSDIR}/www/rubygem-raphael-rails \
>-	rubygem-request_store>=1.1.0:${PORTSDIR}/devel/rubygem-request_store \
>-	rubygem-select2-rails>=3.5.9.3:${PORTSDIR}/www/rubygem-select2-rails \
>-	rubygem-virtus>=1.0.5:${PORTSDIR}/devel/rubygem-virtus \
>+	rubygem-request_store>=1.2.0:${PORTSDIR}/devel/rubygem-request_store \
>+	rubygem-select2-rails>=3.5.9:${PORTSDIR}/www/rubygem-select2-rails \
>+	rubygem-virtus>=1.0.1:${PORTSDIR}/devel/rubygem-virtus \
> 	rubygem-gitlab_meta>=7.0:${PORTSDIR}/devel/rubygem-gitlab_meta \
>-	rubygem-newrelic_rpm>=3.12.0.288:${PORTSDIR}/devel/rubygem-newrelic_rpm \
>+	rubygem-newrelic_rpm>=3.9.4.245:${PORTSDIR}/devel/rubygem-newrelic_rpm \
>+	rubygem-newrelic-grape-rails41>=0:${PORTSDIR}/devel/rubygem-newrelic-grape-rails41 \
> 	rubygem-octokit>=3.7.0:${PORTSDIR}/net/rubygem-octokit \
>+	rubygem-mail_room>=0.5.2:${PORTSDIR}/mail/rubygem-mail_room \
>+	rubygem-email_reply_parser>=0.5.8:${PORTSDIR}/mail/rubygem-email_reply_parser \
>+	rubygem-activerecord-deprecated_finders>=1.0.3:${PORTSDIR}/devel/rubygem-activerecord-deprecated_finders \
>+	rubygem-activerecord-session_store-rails41>=0.1.0:${PORTSDIR}/devel/rubygem-activerecord-session_store-rails41 \
>+	rubygem-nested_form>=0.3.2:${PORTSDIR}/www/rubygem-nested_form \
>+	rubygem-whenever>=0.8.4:${PORTSDIR}/devel/rubygem-whenever \
>+	rubygem-oauth2>=1.0.0:${PORTSDIR}/net/rubygem-oauth2 \
>+	rubygem-paranoia-rails41>=2.0:${PORTSDIR}/databases/rubygem-paranoia-rails41 \
> 	rubygem-rinku>=1.7.3:${PORTSDIR}/www/rubygem-rinku
> 
> USE=	pgsql=yes
>Index: distinfo
>===================================================================
>--- distinfo	(.../gitlab)	(Revision 192)
>+++ distinfo	(.../gitlab8)	(Revision 192)
>@@ -1,2 +1,2 @@
>-SHA256 (gitlabhq-gitlabhq-v7.14.3_GH0.tar.gz) = 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4
>-SIZE (gitlabhq-gitlabhq-v7.14.3_GH0.tar.gz) = 6393535
>+SHA256 (gitlabhq-gitlabhq-v8.0.4_GH0.tar.gz) = 644b4bc98907bb171a1281ae73ac510f1bc6d379d39020f61e1697bb73547ae8
>+SIZE (gitlabhq-gitlabhq-v8.0.4_GH0.tar.gz) = 8238901
>Index: files/patch-Gemfile
>===================================================================
>--- files/patch-Gemfile	(.../gitlab)	(Revision 192)
>+++ files/patch-Gemfile	(.../gitlab8)	(Revision 192)
>@@ -1,58 +1,47 @@
>---- Gemfile.orig	2015-09-03 15:24:22 UTC
>+--- Gemfile.orig	2015-09-29 03:21:41 UTC
> +++ Gemfile
>-@@ -1,6 +1,6 @@
>- source "https://rubygems.org"
>+@@ -8,7 +8,7 @@ def linux_only(require_as)
>+   RUBY_PLATFORM.include?('linux') && require_as
>+ end
>  
>--gem 'rails', '4.1.11'
>-+gem 'rails', '~> 4.1.11'
>+-gem 'rails', '4.1.12'
>++gem 'rails', '>= 4.1.12'
>  
>  # Specify a sprockets version due to security issue
>  # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
>-@@ -10,31 +10,29 @@ gem 'sprockets', '~> 2.12.3'
>+@@ -18,24 +18,22 @@ gem 'sprockets', '~> 2.12.3'
>  gem "default_value_for", "~> 3.0.0"
>  
>  # Supported DBs
>--gem "mysql2", group: :mysql
>- gem "pg", group: :postgres
>+-gem "mysql2", '~> 0.3.16', group: :mysql
>+ gem "pg", '~> 0.18.2', group: :postgres
>  
>  # Authentication libraries
>--gem "devise", '3.2.4'
>--gem "devise-async", '0.9.0'
>-+gem "devise", '>= 3.2.4'
>+ gem "devise", '~> 3.5.2'
>+-gem "devise-async", '~> 0.9.0'
> +gem "devise-async", '>= 0.9.0'
>  gem 'omniauth', "~> 1.2.2"
>- gem 'omniauth-google-oauth2'
>- gem 'omniauth-twitter'
>- gem 'omniauth-github'
>- gem 'omniauth-shibboleth'
>--gem 'omniauth-kerberos', group: :kerberos
>- gem 'omniauth-gitlab'
>- gem 'omniauth-bitbucket'
>+ gem 'omniauth-google-oauth2', '~> 0.2.5'
>+-gem 'omniauth-twitter', '~> 1.0.1'
>++gem 'omniauth-twitter', '>= 1.0.1'
>+ gem 'omniauth-github', '~> 1.1.1'
>+-gem 'omniauth-shibboleth', '~> 1.1.1'
>+-gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos
>++gem 'omniauth-shibboleth', '>= 1.1.1'
>+ gem 'omniauth-gitlab', '~> 1.0.0'
>+ gem 'omniauth-bitbucket', '~> 0.0.2'
>  gem 'omniauth-saml', '~> 1.4.0'
>--gem 'doorkeeper', '2.1.3'
>+-gem 'doorkeeper', '~> 2.1.3'
>++gem 'doorkeeper', '>= 2.1.3'
>+ gem 'omniauth_crowd'
> -gem "rack-oauth2", "~> 1.0.5"
>-+gem 'doorkeeper', '>= 2.1.3'
> +gem "rack-oauth2", ">= 1.0.5"
>  
>  # Two-factor authentication
>- gem 'devise-two-factor'
>- gem 'rqrcode-rails3'
>--gem 'attr_encrypted', '1.3.4'
>-+gem 'attr_encrypted', '~> 1.3.4'
>+ gem 'devise-two-factor', '~> 2.0.0'
>+@@ -55,7 +53,7 @@ gem "gitlab_git", '~> 7.2.15'
>+ gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
>  
>- # Browser detection
>--gem "browser", '~> 0.8.0'
>-+gem "browser", '>= 0.8.0'
>- 
>- # Extracting information from a git repository
>- # Provide access to Gitlab::Git library
>-@@ -48,10 +46,10 @@ gem 'gitlab-grack', '~> 2.0.2', require:
>- # LDAP Auth
>- # GitLab fork with several improvements to original library. For full list of changes
>- # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
>--gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
>-+gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
>- 
>  # Git Wiki
> -gem 'gollum-lib', '~> 4.0.2'
> +gem 'gollum-lib', '>= 4.0.2'
>@@ -59,7 +48,7 @@
>  
>  # Language detection
>  # GitLab fork of linguist does not require pygments/python dependency.
>-@@ -61,7 +59,7 @@ gem 'gollum-lib', '~> 4.0.2'
>+@@ -65,31 +63,31 @@ gem 'gollum-lib', '~> 4.0.2'
>  gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
>  
>  # API
>@@ -66,67 +55,94 @@
> -gem "grape", "~> 0.6.1"
> +gem "grape", ">= 0.6.1"
>  gem "grape-entity", "~> 0.4.2"
>- gem 'rack-cors', require: 'rack/cors'
>+-gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
>++gem 'rack-cors', '>= 0.2.9', require: 'rack/cors'
>  
>-@@ -73,7 +71,7 @@ gem "stamp"
>- gem 'enumerize'
>+ # Format dates and times
>+ # based on human-friendly examples
>+-gem "stamp", '~> 0.5.0'
>++gem "stamp", '>= 0.5.0'
>  
>+ # Enumeration fields
>+-gem 'enumerize', '~> 0.7.0'
>++gem 'enumerize', '>= 0.7.0'
>+ 
>  # Pagination
> -gem "kaminari", "~> 0.15.1"
> +gem "kaminari", ">= 0.15.1"
>  
>  # HAML
>- gem "haml-rails"
>-@@ -85,7 +83,7 @@ gem "carrierwave"
>- gem 'dropzonejs-rails'
>+-gem "haml-rails", '~> 0.5.3'
>++gem "haml-rails", '>= 0.5.3'
>  
>+ # Files attachments
>+-gem "carrierwave", '~> 0.9.0'
>++gem "carrierwave", '>= 0.9.0'
>+ 
>+ # Drag and Drop UI
>+ gem 'dropzonejs-rails', '~> 0.7.1'
>+ 
>  # for aws storage
> -gem "fog", "~> 1.25.0"
> +gem "fog", ">= 1.25.0"
>- gem "unf"
>+ gem "unf", '~> 0.1.4'
>  
>  # Authorization
>-@@ -96,14 +94,14 @@ gem "seed-fu"
>- 
>+@@ -101,13 +99,13 @@ gem "seed-fu", '~> 2.3.5'
>  # Markdown and HTML processing
>  gem 'html-pipeline', '~> 1.11.0'
>--gem 'task_list',     '1.0.2', require: 'task_list/railtie'
>-+gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
>- gem 'github-markup'
>+ gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
>+-gem 'github-markup', '~> 1.3.1'
>++gem 'github-markup', '>= 1.3.1'
>  gem 'redcarpet',     '~> 3.3.2'
>- gem 'RedCloth'
>+ gem 'RedCloth',      '~> 4.2.9'
> -gem 'rdoc',          '~>3.6'
>--gem 'org-ruby',      '= 0.9.12'
>++gem 'rdoc',          '>= 3.6'
>+ gem 'org-ruby',      '~> 0.9.12'
> -gem 'creole',        '~>0.3.6'
>--gem 'wikicloth',     '=0.8.1'
>-+gem 'rdoc',          '>= 3.6'
>-+gem 'org-ruby',      '~> 0.9.12'
>+-gem 'wikicloth',     '0.8.1'
> +gem 'creole',        '>= 0.3.6'
> +gem 'wikicloth',     '>= 0.8.1'
>  gem 'asciidoctor',   '~> 1.5.2'
>  
>  # Diffs
>-@@ -111,7 +109,7 @@ gem 'diffy', '~> 3.0.3'
>+@@ -115,7 +113,7 @@ gem 'diffy', '~> 3.0.3'
>  
>  # Application server
>  group :unicorn do
>--  gem "unicorn", '~> 4.6.3'
>-+  gem "unicorn", '>= 4.6.3'
>-   gem 'unicorn-worker-killer'
>+-  gem "unicorn", '~> 4.8.2'
>++  gem "unicorn", '>= 4.8.2'
>+   gem 'unicorn-worker-killer', '~> 0.4.2'
>  end
>  
>-@@ -125,7 +123,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
>- gem 'slim'
>- gem 'sinatra', require: nil
>- gem 'sidekiq', '~> 3.3'
>--gem 'sidetiq', '0.6.3'
>-+gem 'sidetiq', '>= 0.6.3'
>+@@ -125,12 +123,12 @@ gem "state_machine", '~> 1.2.0'
>+ gem 'after_commit_queue'
>  
>+ # Issue tags
>+-gem 'acts-as-taggable-on', '~> 3.4'
>++gem 'acts-as-taggable-on', '>= 3.4'
>+ 
>+ # Background jobs
>+-gem 'slim', '~> 2.0.2'
>++gem 'slim', '>= 2.0.2'
>+ gem 'sinatra', '~> 1.4.4', require: nil
>+-gem 'sidekiq', '3.3.0'
>++gem 'sidekiq', '>= 3.3.0'
>+ gem 'sidetiq', '~> 0.6.3'
>+ 
>  # HTTP requests
>- gem "httparty"
>-@@ -144,7 +142,7 @@ gem 'version_sorter'
>- gem "redis-rails"
>+@@ -138,7 +136,7 @@ gem "httparty", '~> 0.13.3'
>  
>+ # Colored output to console
>+ gem "colored", '~> 1.2'
>+-gem "colorize", '~> 0.5.8'
>++gem "colorize", '>= 0.5.8'
>+ 
>+ # GitLab settings
>+ gem 'settingslogic', '~> 2.0.9'
>+@@ -151,7 +149,7 @@ gem 'version_sorter', '~> 2.0.0'
>+ gem "redis-rails", '~> 4.0.0'
>+ 
>  # Campfire integration
> -gem 'tinder', '~> 1.9.2'
> +gem 'tinder', '>= 1.9.2'
>@@ -133,7 +149,7 @@
>  
>  # HipChat integration
>  gem 'hipchat', '~> 1.5.0'
>-@@ -156,10 +154,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
>+@@ -163,7 +161,7 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
>  gem "gemnasium-gitlab-service", "~> 0.2"
>  
>  # Slack integration
>@@ -141,12 +157,8 @@
> +gem "slack-notifier", ">= 1.0.0"
>  
>  # Asana integration
>--gem 'asana', '~> 0.0.6'
>-+gem 'asana', '>= 0.0.6'
>- 
>- # d3
>- gem 'd3_rails', '~> 3.5.5'
>-@@ -168,10 +166,10 @@ gem 'd3_rails', '~> 3.5.5'
>+ gem 'asana', '~> 0.0.6'
>+@@ -178,116 +176,52 @@ gem 'd3_rails', '~> 3.5.5'
>  gem "cal-heatmap-rails", "~> 0.0.1"
>  
>  # underscore-rails
>@@ -159,57 +171,81 @@
>  
>  # Protect against bruteforcing
>  gem "rack-attack", '~> 4.3.0'
>-@@ -195,9 +193,9 @@ gem 'addressable'
>+ 
>+ # Ace editor
>+-gem 'ace-rails-ap', '~> 2.0.1'
>++gem 'ace-rails-ap', '>= 2.0.1'
>+ 
>+ # Keyboard shortcuts
>+ gem 'mousetrap-rails', '~> 1.4.6'
>+ 
>+ # Detect and convert string character encoding
>+-gem 'charlock_holmes', '~> 0.6.9.4'
>++gem 'charlock_holmes', '>= 0.6.9.4'
>+ 
>+ gem "sass-rails", '~> 4.0.5'
>+ gem "coffee-rails", '~> 4.1.0'
>+-gem "uglifier", '~> 2.3.2'
>++gem "uglifier", '>= 2.3.2'
>+ gem 'turbolinks', '~> 2.5.0'
>+-gem 'jquery-turbolinks', '~> 2.0.1'
>++gem 'jquery-turbolinks', '>= 2.0.1'
>+ 
>+ gem 'addressable',        '~> 2.3.8'
>  gem 'bootstrap-sass',     '~> 3.0'
>- gem 'font-awesome-rails', '~> 4.2'
>+-gem 'font-awesome-rails', '~> 4.2'
>++gem 'font-awesome-rails', '>= 4.2'
>  gem 'gitlab_emoji',       '~> 0.1'
> -gem 'gon',                '~> 5.0.0'
> -gem 'jquery-atwho-rails', '~> 1.0.0'
>--gem 'jquery-rails',       '3.1.3'
>+-gem 'jquery-rails',       '~> 3.1.3'
> +gem 'gon',                '>= 5.0.0'
> +gem 'jquery-atwho-rails', '>= 1.0.0'
>-+gem 'jquery-rails',       '~> 3.1.3'
>- gem 'jquery-scrollto-rails'
>- gem 'jquery-ui-rails'
>- gem 'nprogress-rails'
>-@@ -206,69 +204,12 @@ gem 'request_store'
>++gem 'jquery-rails',       '>= 3.1.3'
>+ gem 'jquery-scrollto-rails', '~> 1.4.3'
>+ gem 'jquery-ui-rails',    '~> 4.2.1'
>+-gem 'nprogress-rails',    '~> 0.1.2.3'
>++gem 'nprogress-rails',    '>= 0.1.2.3'
>+ gem 'raphael-rails',      '~> 2.1.2'
>+ gem 'request_store',      '~> 1.2.0'
>  gem 'select2-rails',      '~> 3.5.9'
>- gem 'virtus'
>+ gem 'virtus',             '~> 1.0.1'
>  
> -group :development do
>--  gem 'brakeman', require: false
>--  gem "annotate", "~> 2.6.0.beta2"
>--  gem "letter_opener"
>--  gem 'quiet_assets', '~> 1.0.1'
>--  gem 'rack-mini-profiler', require: false
>+-  gem "foreman"
>+-  gem 'brakeman', '3.0.1', require: false
>+-
>+-  gem "annotate", "~> 2.6.0"
>+-  gem "letter_opener", '~> 1.1.2'
>+-  gem 'quiet_assets', '~> 1.0.2'
>+-  gem 'rack-mini-profiler', '~> 0.9.0', require: false
> -  gem 'rerun', '~> 0.10.0'
> -
> -  # Better errors handler
>--  gem 'better_errors'
>--  gem 'binding_of_caller'
>+-  gem 'better_errors', '~> 1.0.1'
>+-  gem 'binding_of_caller', '~> 0.7.2'
> -
> -  # Docs generator
>--  gem "sdoc"
>+-  gem "sdoc", '~> 0.3.20'
> -
> -  # thin instead webrick
>--  gem 'thin'
>+-  gem 'thin', '~> 1.6.1'
> -end
> -
> -group :development, :test do
>--  gem 'awesome_print'
> -  gem 'byebug', platform: :mri
>--  gem 'fuubar', '~> 2.0.0'
> -  gem 'pry-rails'
> -
>--  gem 'coveralls',        '~> 0.8.2', require: false
>+-  gem 'awesome_print', '~> 1.2.0'
>+-  gem 'fuubar', '~> 2.0.0'
>+-
> -  gem 'database_cleaner', '~> 1.4.0'
>--  gem 'factory_girl_rails'
>+-  gem 'factory_girl_rails', '~> 4.3.0'
> -  gem 'rspec-rails',      '~> 3.3.0'
>--  gem 'rubocop',          '0.28.0',   require: false
>--  gem 'spinach-rails'
>+-  gem 'spinach-rails', '~> 0.2.1'
> -
> -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
>--  gem 'minitest', '~> 5.3.0'
>+-  gem 'minitest', '~> 5.7.0'
> -
> -  # Generate Fake data
> -  gem 'ffaker', '~> 2.0.0'
>@@ -219,30 +255,56 @@
> -  gem 'poltergeist',         '~> 1.6.0'
> -
> -  gem 'teaspoon', '~> 1.0.0'
>--  gem 'teaspoon-jasmine'
>+-  gem 'teaspoon-jasmine', '~> 2.2.0'
> -
>--  gem 'spring', '~> 1.3.1'
>--  gem 'spring-commands-rspec',    '~> 1.0.0'
>+-  gem 'spring', '~> 1.3.6'
>+-  gem 'spring-commands-rspec',    '~> 1.0.4'
> -  gem 'spring-commands-spinach',  '~> 1.0.0'
> -  gem 'spring-commands-teaspoon', '~> 0.0.2'
>+-
>+-  gem 'rubocop',  '~> 0.28.0',  require: false
>+-  gem 'coveralls',  '~> 0.8.2', require: false
>+-  gem 'simplecov', '~> 0.10.0', require: false
> -end
> -
> -group :test do
>--  gem 'simplecov', require: false
> -  gem 'shoulda-matchers', '~> 2.8.0', require: false
> -  gem 'email_spec', '~> 1.6.0'
> -  gem 'webmock', '~> 1.21.0'
>--  gem 'test_after_commit'
>+-  gem 'test_after_commit', '~> 0.2.2'
>+-  gem 'sham_rack'
> -end
> -
>  group :production do
>--  gem "gitlab_meta", '7.0'
>-+  gem "gitlab_meta", '~> 7.0'
>+   gem "gitlab_meta", '7.0'
>  end
>  
>- gem "newrelic_rpm"
>+-gem "newrelic_rpm", '~> 3.9.4.245'
>++gem "newrelic_rpm", '>= 3.9.4.245'
>+ gem 'newrelic-grape'
>  
>--gem 'octokit', '3.7.0'
>+-gem 'octokit', '~> 3.7.0'
> +gem 'octokit', '>= 3.7.0'
>-+
>-+gem 'rinku'
>+ 
>+ gem "mail_room", "~> 0.5.2"
>+ 
>+@@ -299,18 +233,10 @@ gem 'activerecord-session_store', '~> 0.
>+ gem "nested_form", '~> 0.3.2'
>+ 
>+ # Scheduled
>+-gem 'whenever', '~> 0.8.4', require: false
>++gem 'whenever', '>= 0.8.4', require: false
>+ 
>+ # OAuth
>+ gem 'oauth2', '~> 1.0.0'
>+ 
>+ # Soft deletion
>+ gem "paranoia", "~> 2.0"
>+-
>+-group :development, :test do
>+-  gem 'guard-rspec', '~> 4.2.0'
>+-
>+-  gem 'rb-fsevent', require: darwin_only('rb-fsevent')
>+-  gem 'growl',      require: darwin_only('growl')
>+-  gem 'rb-inotify', require: linux_only('rb-inotify')
>+-end
>Index: pkg-message
>===================================================================
>--- pkg-message	(.../gitlab)	(Revision 192)
>+++ pkg-message	(.../gitlab8)	(Revision 192)
>@@ -2,4 +2,4 @@
> it depends on other software too. A basic guide to install
> GitLab can be found here:
> 
>-https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/install/installation-freebsd.md
>\ No newline at end of file
>+https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/install/installation-freebsd.md

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 203619: 161805