[DRE-commits] [gitlab] branch master updated (8f3961c -> 2f0f8af)
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Feb 7 10:36:04 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 8f3961c upload to unstable
adds f90c99e Imported Upstream version 8.4.3+dfsg
new 1fa17d8 Merge tag 'upstream/8.4.3+dfsg'
new 73cd87d remove ~ in dversionmangle
new 9eb83cd update changelog
new 673f0f5 refresh patches
new d3154a8 relax nokogiri
new 76fb55e really relax nokogiri
new 262ff0b add nginx example conf with ssl
new 75f6123 install nginx ssl conf example
new 2307619 add letsencrypt details
new e50ef92 add letencrypt option
new e1a6f88 ask letsencrypt question
new e7b6777 configure ssl in nginx
new b731561 update templates
new f470f67 add link to letsencrypt certificate
new 2ef2ae7 fix alignment, use only space, add comments
new dd0d0b7 update changelog
new 2f0f8af use mktemp for temporary files
The 17 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:
.gitlab-ci.yml | 11 +-
CHANGELOG | 31 ++-
GITLAB_WORKHORSE_VERSION | 2 +-
Gemfile | 5 +-
Gemfile.lock | 70 +++---
VERSION | 2 +-
.../javascripts/behaviors/autosize.js.coffee | 20 +-
app/assets/javascripts/blob/edit_blob.js.coffee | 1 +
app/assets/stylesheets/framework/common.scss | 16 --
app/assets/stylesheets/framework/files.scss | 22 +-
app/assets/stylesheets/framework/highlight.scss | 18 +-
.../stylesheets/framework/markdown_area.scss | 2 +-
app/assets/stylesheets/framework/tables.scss | 6 +-
app/assets/stylesheets/framework/typography.scss | 18 +-
app/assets/stylesheets/highlight/dark.scss | 56 ++---
app/assets/stylesheets/highlight/monokai.scss | 56 ++---
.../stylesheets/highlight/solarized_dark.scss | 56 ++---
.../stylesheets/highlight/solarized_light.scss | 57 ++---
app/assets/stylesheets/highlight/white.scss | 62 +++++-
app/assets/stylesheets/pages/diff.scss | 65 +-----
app/assets/stylesheets/pages/note_form.scss | 14 +-
app/assets/stylesheets/pages/notes.scss | 4 +-
app/assets/stylesheets/pages/tree.scss | 2 -
app/controllers/omniauth_callbacks_controller.rb | 15 +-
app/controllers/projects/blame_controller.rb | 24 +-
app/controllers/projects/compare_controller.rb | 2 +-
app/controllers/projects/imports_controller.rb | 20 +-
app/models/members/project_member.rb | 6 +-
app/models/merge_request.rb | 6 +-
app/models/merge_request_diff.rb | 28 +--
app/models/project.rb | 5 +
app/models/repository.rb | 4 +-
app/views/projects/blame/show.html.haml | 25 +--
app/views/projects/blob/_text.html.haml | 8 +-
app/views/projects/blob/diff.html.haml | 3 +-
app/views/projects/blob/preview.html.haml | 12 +-
.../commit_statuses/_commit_status.html.haml | 2 +-
app/views/projects/diffs/_match_line.html.haml | 2 +-
.../projects/diffs/_match_line_parallel.html.haml | 8 +-
app/views/projects/diffs/_parallel_view.html.haml | 16 +-
app/views/projects/diffs/_text_file.html.haml | 6 +-
.../projects/notes/discussions/_diff.html.haml | 12 +-
app/views/search/results/_merge_request.html.haml | 2 +-
app/views/search/results/_snippet_blob.html.haml | 42 ++--
app/views/shared/_file_highlight.html.haml | 4 +-
app/views/shared/snippets/_blob.html.haml | 3 +-
config/initializers/metrics.rb | 21 +-
...0160128233227_change_lfs_objects_size_column.rb | 5 +
db/schema.rb | 6 +-
debian/changelog | 9 +
debian/conf/gitlab-debian.conf | 1 +
.../conf/nginx.ssl.conf.example | 12 +-
debian/config | 7 +
debian/gitlab.docs | 1 +
debian/gitlab.templates | 33 ++-
debian/patches/0020-loosen-unicorn.patch | 2 +-
debian/patches/0028-loosen-ace-rails-ap.patch | 2 +-
debian/patches/0037-loosen-request-store.patch | 2 +-
debian/patches/0038-relax-net-ssh.patch | 2 +-
debian/patches/0039-relax-nokogiri.patch | 15 ++
debian/patches/0100-remove-development-test.patch | 2 +-
debian/patches/0102-loosen-octokit.patch | 2 +-
debian/patches/loosen-rails-version.patch | 14 --
debian/patches/series | 2 +-
debian/postinst | 159 +++++++------
debian/watch | 2 +-
doc/install/installation.md | 2 +-
doc/update/8.3-to-8.4.md | 4 +-
lib/api/helpers.rb | 5 +-
lib/ci/api/builds.rb | 2 +-
lib/ci/api/helpers.rb | 10 +-
lib/ci/api/runners.rb | 1 +
lib/gitlab/blame.rb | 54 +++++
lib/gitlab/metrics/instrumentation.rb | 22 +-
spec/controllers/blame_controller_spec.rb | 14 --
.../projects/imports_controller_spec.rb | 109 +++++++++
spec/factories/commit_statuses.rb | 8 +-
spec/features/commits_spec.rb | 127 ++++++-----
spec/javascripts/behaviors/autosize_spec.js.coffee | 11 +
spec/lib/gitlab/blame_spec.rb | 24 ++
spec/lib/gitlab/metrics/instrumentation_spec.rb | 10 +
spec/models/build_spec.rb | 2 +-
spec/models/repository_spec.rb | 20 ++
spec/requests/ci/api/builds_spec.rb | 15 ++
spec/requests/ci/api/runners_spec.rb | 14 ++
spec/spec_helper.rb | 6 +
vendor/assets/javascripts/jquery.ba-resize.js | 246 +++++++++++++++++++++
87 files changed, 1231 insertions(+), 625 deletions(-)
create mode 100644 db/migrate/20160128233227_change_lfs_objects_size_column.rb
copy lib/support/nginx/gitlab-ssl => debian/conf/nginx.ssl.conf.example (93%)
create mode 100644 debian/patches/0039-relax-nokogiri.patch
delete mode 100644 debian/patches/loosen-rails-version.patch
create mode 100644 lib/gitlab/blame.rb
create mode 100644 spec/controllers/projects/imports_controller_spec.rb
create mode 100644 spec/javascripts/behaviors/autosize_spec.js.coffee
create mode 100644 spec/lib/gitlab/blame_spec.rb
create mode 100644 vendor/assets/javascripts/jquery.ba-resize.js
--
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