diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 15:06:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 15:06:17 +0000 |
commit | 00c78fb814d7ce00989ac04edd6cdaa3239da284 (patch) | |
tree | f04920f08eb4e481ce27bd1d96862676dff735dc /app | |
parent | d2ffc30fd583e86d4122bb5061098f4f3ca7b3f1 (diff) | |
download | gitlab-ce-00c78fb814d7ce00989ac04edd6cdaa3239da284.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/files.scss | 2 | ||||
-rw-r--r-- | app/models/blob.rb | 1 | ||||
-rw-r--r-- | app/models/blob_viewer/audio.rb | 12 | ||||
-rw-r--r-- | app/models/blob_viewer/video.rb | 2 | ||||
-rw-r--r-- | app/models/container_repository.rb | 4 | ||||
-rw-r--r-- | app/models/note.rb | 3 | ||||
-rw-r--r-- | app/services/system_notes/issuables_service.rb | 6 | ||||
-rw-r--r-- | app/views/projects/blob/viewers/_audio.html.haml | 2 |
8 files changed, 23 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index b793a12317e..487fbf0fcff 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -108,12 +108,14 @@ background: $white-light; &.image_file, + &.audio, &.video { background: $gray-darker; text-align: center; padding: 30px; img, + audio, video { max-width: 80%; } diff --git a/app/models/blob.rb b/app/models/blob.rb index 1495aed6598..cc089715b06 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -32,6 +32,7 @@ class Blob < SimpleDelegator BlobViewer::Balsamiq, BlobViewer::Video, + BlobViewer::Audio, BlobViewer::PDF, diff --git a/app/models/blob_viewer/audio.rb b/app/models/blob_viewer/audio.rb new file mode 100644 index 00000000000..cc7fe3b0d90 --- /dev/null +++ b/app/models/blob_viewer/audio.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +module BlobViewer + class Audio < Base + include Rich + include ClientSide + + self.partial_name = 'audio' + self.extensions = UploaderHelper::SAFE_AUDIO_EXT + self.binary = true + end +end diff --git a/app/models/blob_viewer/video.rb b/app/models/blob_viewer/video.rb index d35b8e7342e..3ec4e90b24e 100644 --- a/app/models/blob_viewer/video.rb +++ b/app/models/blob_viewer/video.rb @@ -8,7 +8,5 @@ module BlobViewer self.partial_name = 'video' self.extensions = UploaderHelper::SAFE_VIDEO_EXT self.binary = true - self.switcher_icon = 'film' - self.switcher_title = 'video' end end diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb index 253f74e9811..e055b66989b 100644 --- a/app/models/container_repository.rb +++ b/app/models/container_repository.rb @@ -69,9 +69,7 @@ class ContainerRepository < ApplicationRecord digests = tags.map { |tag| tag.digest }.compact.to_set - digests.all? do |digest| - delete_tag_by_digest(digest) - end + digests.map(&method(:delete_tag_by_digest)).all? end def delete_tag_by_digest(digest) diff --git a/app/models/note.rb b/app/models/note.rb index 4e9fd8d2dd1..3e645d79e15 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -145,6 +145,9 @@ class Note < ApplicationRecord end scope :with_metadata, -> { includes(:system_note_metadata) } + scope :for_note_or_capitalized_note, ->(text) { where(note: [text, text.capitalize]) } + scope :like_note_or_capitalized_note, ->(text) { where('(note LIKE ? OR note LIKE ?)', text, text.capitalize) } + after_initialize :ensure_discussion_id before_validation :nullify_blank_type, :nullify_blank_line_code before_validation :set_discussion_id, on: :create diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb index 4377f437798..6fffd2ed4bf 100644 --- a/app/services/system_notes/issuables_service.rb +++ b/app/services/system_notes/issuables_service.rb @@ -288,18 +288,16 @@ module SystemNotes "#{self.class.cross_reference_note_prefix}#{gfm_reference}" end - # rubocop: disable CodeReuse/ActiveRecord def notes_for_mentioner(mentioner, noteable, notes) if mentioner.is_a?(Commit) text = "#{self.class.cross_reference_note_prefix}%#{mentioner.to_reference(nil)}" - notes.where('(note LIKE ? OR note LIKE ?)', text, text.capitalize) + notes.like_note_or_capitalized_note(text) else gfm_reference = mentioner.gfm_reference(noteable.project || noteable.group) text = cross_reference_note_content(gfm_reference) - notes.where(note: [text, text.capitalize]) + notes.for_note_or_capitalized_note(text) end end - # rubocop: enable CodeReuse/ActiveRecord def self.cross_reference_note_prefix 'mentioned in ' diff --git a/app/views/projects/blob/viewers/_audio.html.haml b/app/views/projects/blob/viewers/_audio.html.haml new file mode 100644 index 00000000000..dbdf243c36b --- /dev/null +++ b/app/views/projects/blob/viewers/_audio.html.haml @@ -0,0 +1,2 @@ +.file-content.audio + %audio{ src: blob_raw_path, controls: true, data: { setup: '{}' } } |