diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-06-07 20:13:17 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-06-07 20:13:17 +0000 |
| commit | 99df0218f82b851b017bd0eea1b8351dc89df6ed (patch) | |
| tree | b01f884fbd1418dd5465fc1741f1620061ae8c5c /spec/javascripts/fixtures/pdf_viewer.html.haml | |
| parent | 3eea6906747d10bea501426febaf15d2c209e06a (diff) | |
| parent | e07b2b277f79bc25cdce22ca2defba1ba80791aa (diff) | |
| download | gitlab-ce-99df0218f82b851b017bd0eea1b8351dc89df6ed.tar.gz | |
Merge branch 'master' into 'docs/fix-example-dot-net'
# Conflicts:
# doc/user/project/clusters/serverless/index.md
Diffstat (limited to 'spec/javascripts/fixtures/pdf_viewer.html.haml')
| -rw-r--r-- | spec/javascripts/fixtures/pdf_viewer.html.haml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/pdf_viewer.html.haml b/spec/javascripts/fixtures/pdf_viewer.html.haml deleted file mode 100644 index 2e57beae54b..00000000000 --- a/spec/javascripts/fixtures/pdf_viewer.html.haml +++ /dev/null @@ -1 +0,0 @@ -.file-content#js-pdf-viewer{ data: { endpoint: '/test' } } |