[DRE-commits] [gitlab] branch master updated (2a885bf -> ad4b307)

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Fri Jan 29 17:57:08 UTC 2016


This is an automated email from the git hooks/post-receive script.

praveen pushed a change to branch master
in repository gitlab.

      from  2a885bf   relax net-ssh
       new  801c0bc   remove sudo
       new  945b5ce   update quotes
       new  db893ad   fix quotes
      adds  f011be6   Imported Upstream version 8.4.0+dfsg
       new  219627f   Merge tag 'upstream/8.4.0+dfsg'
       new  e602990   update changelog
       new  e588efc   refresh patches
       new  ad4b307   permission change is now merged

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG                                          |  25 +-
 GITLAB_WORKHORSE_VERSION                           |   2 +-
 Gemfile                                            |   5 +-
 Gemfile.lock                                       |  13 +-
 Rakefile                                           |   0
 VERSION                                            |   2 +-
 app/assets/fonts/OFL.txt                           |   0
 app/assets/fonts/SourceSansPro-Black.ttf.woff      | Bin
 app/assets/fonts/SourceSansPro-Black.ttf.woff2     | Bin
 app/assets/fonts/SourceSansPro-BlackIt.ttf.woff    | Bin
 app/assets/fonts/SourceSansPro-BlackIt.ttf.woff2   | Bin
 app/assets/fonts/SourceSansPro-Bold.ttf.woff       | Bin
 app/assets/fonts/SourceSansPro-Bold.ttf.woff2      | Bin
 app/assets/fonts/SourceSansPro-BoldIt.ttf.woff     | Bin
 app/assets/fonts/SourceSansPro-BoldIt.ttf.woff2    | Bin
 app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff | Bin
 .../fonts/SourceSansPro-ExtraLight.ttf.woff2       | Bin
 .../fonts/SourceSansPro-ExtraLightIt.ttf.woff      | Bin
 .../fonts/SourceSansPro-ExtraLightIt.ttf.woff2     | Bin
 app/assets/fonts/SourceSansPro-It.ttf.woff         | Bin
 app/assets/fonts/SourceSansPro-It.ttf.woff2        | Bin
 app/assets/fonts/SourceSansPro-Light.ttf.woff      | Bin
 app/assets/fonts/SourceSansPro-Light.ttf.woff2     | Bin
 app/assets/fonts/SourceSansPro-LightIt.ttf.woff    | Bin
 app/assets/fonts/SourceSansPro-LightIt.ttf.woff2   | Bin
 app/assets/fonts/SourceSansPro-Regular.ttf.woff    | Bin
 app/assets/fonts/SourceSansPro-Regular.ttf.woff2   | Bin
 app/assets/fonts/SourceSansPro-Semibold.ttf.woff   | Bin
 app/assets/fonts/SourceSansPro-Semibold.ttf.woff2  | Bin
 app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff | Bin
 .../fonts/SourceSansPro-SemiboldIt.ttf.woff2       | Bin
 app/assets/javascripts/awards_handler.coffee       |  14 +-
 app/assets/javascripts/build_artifacts.js.coffee   |  14 +
 app/assets/javascripts/dispatcher.js.coffee        |   3 +-
 app/assets/javascripts/shortcuts.js.coffee         |   1 +
 app/assets/javascripts/shortcuts_tree.coffee       |   4 -
 app/assets/javascripts/star.js.coffee              |   4 +-
 app/assets/stylesheets/framework/filters.scss      |   2 +-
 app/assets/stylesheets/highlight/dark.scss         |  18 ++
 app/assets/stylesheets/highlight/monokai.scss      |  18 ++
 .../stylesheets/highlight/solarized_dark.scss      |  18 ++
 .../stylesheets/highlight/solarized_light.scss     |  19 ++
 app/assets/stylesheets/pages/commits.scss          |   4 +
 app/assets/stylesheets/pages/diff.scss             |  15 +
 .../admin/application_settings_controller.rb       |   4 +
 app/controllers/application_controller.rb          |  12 +
 app/controllers/concerns/creates_commit.rb         |   2 +-
 app/controllers/projects/blob_controller.rb        |   9 +-
 app/controllers/projects/commit_controller.rb      |   1 +
 app/controllers/projects/compare_controller.rb     |   3 +-
 .../projects/merge_requests_controller.rb          |   8 +-
 app/controllers/registrations_controller.rb        |   5 +
 app/helpers/blob_helper.rb                         |  33 +--
 app/helpers/commits_helper.rb                      |   2 +-
 app/helpers/diff_helper.rb                         |  69 +----
 app/mailers/emails/builds.rb                       |  13 +
 app/mailers/emails/projects.rb                     |   6 +-
 app/mailers/notify.rb                              |  15 +-
 app/models/application_setting.rb                  |   8 +
 app/models/ci/build.rb                             |   8 +-
 app/models/member.rb                               |   7 +-
 app/models/merge_request.rb                        |  19 +-
 app/models/merge_request_diff.rb                   |   9 +
 app/models/note.rb                                 |   8 +-
 app/models/project.rb                              |   7 +-
 app/models/project_services/ci_service.rb          |   8 +-
 .../gitlab_issue_tracker_service.rb                |   4 +-
 .../project_services/issue_tracker_service.rb      |   6 +-
 app/models/service.rb                              |  11 +-
 app/models/user.rb                                 |   5 +-
 app/services/notification_service.rb               |  21 +-
 .../admin/application_settings/_form.html.haml     |  37 ++-
 app/views/layouts/header/_default.html.haml        |   3 +
 app/views/profiles/show.html.haml                  |   4 +-
 .../projects/artifacts/_tree_directory.html.haml   |   7 +-
 app/views/projects/artifacts/_tree_file.html.haml  |  10 +-
 app/views/projects/artifacts/browse.html.haml      |  20 +-
 app/views/projects/blame/show.html.haml            |   5 +-
 app/views/projects/blob/diff.html.haml             |   2 +-
 app/views/projects/blob/preview.html.haml          |   2 +-
 app/views/projects/builds/show.html.haml           |   2 +-
 app/views/projects/commit/show.html.haml           |   3 +-
 app/views/projects/compare/show.html.haml          |   2 +-
 app/views/projects/diffs/_diffs.html.haml          |   2 +-
 app/views/projects/diffs/_file.html.haml           |  40 ++-
 app/views/projects/diffs/_parallel_view.html.haml  |  52 ++--
 app/views/projects/diffs/_text_file.html.haml      |  16 +-
 app/views/projects/find_file/show.html.haml        |   2 +-
 .../projects/merge_requests/_new_submit.html.haml  |   2 +-
 .../projects/merge_requests/show/_diffs.html.haml  |   3 +-
 .../projects/notes/discussions/_diff.html.haml     |   2 +-
 app/views/shared/_file_highlight.html.haml         |   3 +-
 config.ru                                          |   5 +-
 config/initializers/1_settings.rb                  |  22 +-
 config/initializers/sentry.rb                      |  19 ++
 ...118155830_add_sentry_to_application_settings.rb |   8 +
 ...ip_blocking_settings_to_application_settings.rb |   6 +
 db/migrate/20160119111158_add_services_category.rb |  39 +++
 db/migrate/20160119112418_add_services_default.rb  |  20 ++
 .../20160119145451_add_ldap_email_to_users.rb      |  30 ++
 ...3_add_base_commit_sha_to_merge_request_diffs.rb |   5 +
 db/migrate/limits_to_mysql.rb                      |   1 +
 db/schema.rb                                       |  22 +-
 debian/changelog                                   |   7 +
 debian/grantpriv.sh                                |  10 +-
 debian/patches/0002-loosen-devise.patch            |   2 +-
 debian/patches/0100-remove-development-test.patch  |   9 +-
 debian/patches/0102-loosen-octokit.patch           |   4 +-
 .../0300-no-hard-coded-workhorse-path.patch        |  15 -
 debian/patches/series                              |   1 -
 debian/postinst                                    |   2 +-
 debian/rules                                       |  67 -----
 doc/README.md                                      |   4 +
 doc/administration/environment_variables.md        |   2 +
 doc/administration/housekeeping.md                 |  22 ++
 doc/administration/img/housekeeping_settings.png   | Bin 0 -> 23856 bytes
 doc/administration/restart_gitlab.md               | 145 +++++++++
 doc/ci/README.md                                   |   1 +
 doc/ci/build_artifacts/README.md                   | 173 +++++++++++
 .../img/build_artifacts_browser.png                | Bin 0 -> 89132 bytes
 .../img/build_artifacts_browser_button.png         | Bin 0 -> 11614 bytes
 doc/ci/yaml/README.md                              |  60 +++-
 doc/development/doc_styleguide.md                  |  18 ++
 doc/install/database_mysql.md                      |  26 +-
 doc/monitoring/performance/gitlab_configuration.md |  39 +++
 .../img/metrics_gitlab_configuration_settings.png  | Bin 0 -> 45148 bytes
 .../performance/influxdb_configuration.md          | 192 ++++++++++++
 doc/monitoring/performance/influxdb_schema.md      |  87 ++++++
 doc/monitoring/performance/introduction.md         |  64 ++++
 doc/update/8.3-to-8.4.md                           |   7 +-
 doc/update/README.md                               |   1 +
 doc/workflow/README.md                             |   1 +
 doc/workflow/file_finder.md                        |  46 +++
 doc/workflow/img/file_finder_find_button.png       | Bin 0 -> 30974 bytes
 doc/workflow/img/file_finder_find_file.png         | Bin 0 -> 42658 bytes
 features/project/builds/artifacts.feature          |   2 +-
 features/steps/project/builds/artifacts.rb         |   4 +-
 features/steps/project/merge_requests.rb           |   2 +-
 lib/banzai/filter/reference_filter.rb              |   2 +
 lib/ci/gitlab_ci_yaml_processor.rb                 |   8 +
 lib/dnsxl_check.rb                                 | 105 +++++++
 lib/gitlab/ci/build/artifacts/metadata.rb          |   8 +-
 lib/gitlab/ci/build/artifacts/metadata/entry.rb    |   7 +
 lib/gitlab/diff/file.rb                            |  21 +-
 lib/gitlab/diff/highlight.rb                       |  82 ++++++
 lib/gitlab/diff/inline_diff.rb                     |  73 +++++
 lib/gitlab/diff/inline_diff_marker.rb              | 109 +++++++
 lib/gitlab/diff/line.rb                            |   3 +-
 lib/gitlab/diff/parallel_diff.rb                   | 119 ++++++++
 lib/gitlab/diff/parser.rb                          |  28 +-
 lib/gitlab/email/message/repository_push.rb        |   1 +
 lib/gitlab/github_import/importer.rb               |   8 +-
 lib/gitlab/github_import/pull_request_formatter.rb |   6 +-
 lib/gitlab/highlight.rb                            |  38 +++
 lib/gitlab/inline_diff.rb                          | 104 -------
 lib/gitlab/ip_check.rb                             |  34 +++
 lib/gitlab/ldap/user.rb                            |  29 +-
 lib/gitlab/o_auth/auth_hash.rb                     |   8 +-
 lib/gitlab/o_auth/user.rb                          |  14 +-
 lib/support/init.d/gitlab                          |   9 +-
 lib/support/init.d/gitlab.default.example          |   3 +
 spec/fixtures/ci_build_artifacts_metadata.gz       | Bin 415 -> 461 bytes
 spec/fixtures/parallel_diff_result.yml             | 324 +++++++++++++++++++++
 spec/helpers/blob_helper_spec.rb                   |  63 ++--
 spec/helpers/diff_helper_spec.rb                   |  68 +----
 spec/initializers/settings_spec.rb                 |  44 +++
 spec/lib/ci/gitlab_ci_yaml_processor_spec.rb       |  25 +-
 spec/lib/dnsxl_check_spec.rb                       |  68 +++++
 .../ci/build/artifacts/metadata/entry_spec.rb      |  15 +-
 .../lib/gitlab/ci/build/artifacts/metadata_spec.rb |  17 +-
 spec/lib/gitlab/diff/file_spec.rb                  |   2 +-
 spec/lib/gitlab/diff/highlight_spec.rb             |  41 +++
 spec/lib/gitlab/diff/inline_diff_marker_spec.rb    |  15 +
 spec/lib/gitlab/diff/inline_diff_spec.rb           |  27 ++
 spec/lib/gitlab/diff/parallel_diff_spec.rb         |  22 ++
 spec/lib/gitlab/diff/parser_spec.rb                |   2 +-
 .../github_import/pull_request_formatter_spec.rb   |  27 +-
 spec/lib/gitlab/highlight_spec.rb                  |  21 ++
 spec/lib/gitlab/inline_diff_spec.rb                |  39 ---
 spec/lib/gitlab/ldap/user_spec.rb                  |  28 +-
 spec/mailers/notify_spec.rb                        |  57 +++-
 spec/models/application_setting_spec.rb            |   2 +
 spec/models/build_spec.rb                          |   8 +-
 .../merge_when_build_succeeds_service_spec.rb      |   2 +-
 spec/services/notification_service_spec.rb         |  58 +++-
 spec/services/projects/create_service_spec.rb      |   1 +
 186 files changed, 2998 insertions(+), 690 deletions(-)
 mode change 100644 => 100755 Rakefile
 mode change 100755 => 100644 app/assets/fonts/OFL.txt
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Black.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Black.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-BlackIt.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-BlackIt.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Bold.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Bold.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-BoldIt.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-BoldIt.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-ExtraLightIt.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-ExtraLightIt.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-It.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-It.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Light.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Light.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-LightIt.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-LightIt.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Regular.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Regular.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Semibold.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-Semibold.ttf.woff2
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff
 mode change 100755 => 100644 app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff2
 create mode 100644 app/assets/javascripts/build_artifacts.js.coffee
 delete mode 100644 app/assets/javascripts/shortcuts_tree.coffee
 create mode 100644 config/initializers/sentry.rb
 create mode 100644 db/migrate/20160118155830_add_sentry_to_application_settings.rb
 create mode 100644 db/migrate/20160118232755_add_ip_blocking_settings_to_application_settings.rb
 create mode 100644 db/migrate/20160119111158_add_services_category.rb
 create mode 100644 db/migrate/20160119112418_add_services_default.rb
 create mode 100644 db/migrate/20160119145451_add_ldap_email_to_users.rb
 create mode 100644 db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb
 delete mode 100644 debian/patches/0300-no-hard-coded-workhorse-path.patch
 create mode 100644 doc/administration/housekeeping.md
 create mode 100644 doc/administration/img/housekeeping_settings.png
 create mode 100644 doc/administration/restart_gitlab.md
 create mode 100644 doc/ci/build_artifacts/README.md
 create mode 100644 doc/ci/build_artifacts/img/build_artifacts_browser.png
 create mode 100644 doc/ci/build_artifacts/img/build_artifacts_browser_button.png
 create mode 100644 doc/monitoring/performance/gitlab_configuration.md
 create mode 100644 doc/monitoring/performance/img/metrics_gitlab_configuration_settings.png
 create mode 100644 doc/monitoring/performance/influxdb_configuration.md
 create mode 100644 doc/monitoring/performance/influxdb_schema.md
 create mode 100644 doc/monitoring/performance/introduction.md
 create mode 100644 doc/workflow/file_finder.md
 create mode 100644 doc/workflow/img/file_finder_find_button.png
 create mode 100644 doc/workflow/img/file_finder_find_file.png
 create mode 100644 lib/dnsxl_check.rb
 create mode 100644 lib/gitlab/diff/highlight.rb
 create mode 100644 lib/gitlab/diff/inline_diff.rb
 create mode 100644 lib/gitlab/diff/inline_diff_marker.rb
 create mode 100644 lib/gitlab/diff/parallel_diff.rb
 create mode 100644 lib/gitlab/highlight.rb
 delete mode 100644 lib/gitlab/inline_diff.rb
 create mode 100644 lib/gitlab/ip_check.rb
 create mode 100644 spec/fixtures/parallel_diff_result.yml
 create mode 100644 spec/initializers/settings_spec.rb
 create mode 100644 spec/lib/dnsxl_check_spec.rb
 create mode 100644 spec/lib/gitlab/diff/highlight_spec.rb
 create mode 100644 spec/lib/gitlab/diff/inline_diff_marker_spec.rb
 create mode 100644 spec/lib/gitlab/diff/inline_diff_spec.rb
 create mode 100644 spec/lib/gitlab/diff/parallel_diff_spec.rb
 create mode 100644 spec/lib/gitlab/highlight_spec.rb
 delete mode 100644 spec/lib/gitlab/inline_diff_spec.rb

-- 
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