summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-06 16:23:49 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-06 16:23:49 +0000
commit413484f2deb74fdaf5796f879424218b6df21740 (patch)
tree7ad0da1f3cf4002c87c0e6acd6d59cc0f77cafec
parent22780c4ac32a29347317a979c4b8bdf2913d34f7 (diff)
parentbb3801268b0ff51543c8a6c727eb7574a2460d45 (diff)
downloadgitlab-ce-413484f2deb74fdaf5796f879424218b6df21740.tar.gz
Merge branch 'remove-lowercase-gitlab-ci-yml' into 'master'
Remove duplicate templates that are lowercase See merge request !5114
-rw-r--r--spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb6
-rw-r--r--vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml16
-rw-r--r--vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml13
-rw-r--r--vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml16
-rw-r--r--vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml25
-rw-r--r--vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml12
-rw-r--r--vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml11
-rw-r--r--vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml25
-rw-r--r--vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml24
-rw-r--r--vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml12
-rw-r--r--vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml17
-rw-r--r--vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml27
-rw-r--r--vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml12
-rw-r--r--vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml15
-rw-r--r--vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml10
15 files changed, 3 insertions, 238 deletions
diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
index b8c06c383fb..fca40f68b01 100644
--- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
+++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
@@ -19,12 +19,12 @@ feature 'User wants to add a .gitlab-ci.yml file', feature: true do
find('.js-gitlab-ci-yml-selector').click
wait_for_ajax
within '.gitlab-ci-yml-selector' do
- find('.dropdown-input-field').set('jekyll')
- find('.dropdown-content li', text: 'jekyll').click
+ find('.dropdown-input-field').set('Jekyll')
+ find('.dropdown-content li', text: 'Jekyll').click
end
wait_for_ajax
- expect(page).to have_css('.gitlab-ci-yml-selector .dropdown-toggle-text', text: 'jekyll')
+ expect(page).to have_css('.gitlab-ci-yml-selector .dropdown-toggle-text', text: 'Jekyll')
expect(page).to have_content('This file is a template, and might need editing before it works on your project')
expect(page).to have_content('jekyll build -d test')
end
diff --git a/vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml
deleted file mode 100644
index 7fcc0b436b5..00000000000
--- a/vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Full project: https://gitlab.com/pages/brunch
-image: node:4.2.2
-
-pages:
- cache:
- paths:
- - node_modules/
-
- script:
- - npm install -g brunch
- - brunch build --production
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml
deleted file mode 100644
index 791afdd23f1..00000000000
--- a/vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Full project: https://gitlab.com/pages/doxygen
-image: alpine
-
-pages:
- script:
- - apk update && apk add doxygen
- - doxygen doxygen/Doxyfile
- - mv doxygen/documentation/html/ public/
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml
deleted file mode 100644
index dd3ef149668..00000000000
--- a/vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Full project: https://gitlab.com/pages/harp
-image: node:4.2.2
-
-pages:
- cache:
- paths:
- - node_modules
-
- script:
- - npm install -g harp
- - harp compile ./ public
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml
deleted file mode 100644
index b468d79bcad..00000000000
--- a/vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Full project: https://gitlab.com/pages/hexo
-image: python:2.7
-
-cache:
- paths:
- - vendor/
-
-test:
- stage: test
- script:
- - pip install hyde
- - hyde gen
- except:
- - master
-
-pages:
- stage: deploy
- script:
- - pip install hyde
- - hyde gen -d public
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml
deleted file mode 100644
index 249a168aa33..00000000000
--- a/vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Full project: https://gitlab.com/pages/plain-html
-pages:
- stage: deploy
- script:
- - mkdir .public
- - cp -r * .public
- - mv .public public
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml
deleted file mode 100644
index 45df6975259..00000000000
--- a/vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Full project: https://gitlab.com/pages/hugo
-image: publysher/hugo
-
-pages:
- script:
- - hugo
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml
deleted file mode 100644
index f5b40f2b9f1..00000000000
--- a/vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Full project: https://gitlab.com/pages/hyde
-image: python:2.7
-
-cache:
- paths:
- - vendor/
-
-test:
- stage: test
- script:
- - pip install hyde
- - hyde gen
- except:
- - master
-
-pages:
- stage: deploy
- script:
- - pip install hyde
- - hyde gen -d public
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml
deleted file mode 100644
index 36918fc005a..00000000000
--- a/vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Full project: https://gitlab.com/pages/jekyll
-image: ruby:2.3
-
-test:
- stage: test
- script:
- - gem install jekyll
- - jekyll build -d test
- artifacts:
- paths:
- - test
- except:
- - master
-
-pages:
- stage: deploy
- script:
- - gem install jekyll
- - jekyll build -d public
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml
deleted file mode 100644
index c5c44a5d86c..00000000000
--- a/vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Full project: https://gitlab.com/pages/hyde
-image: python:2.7
-
-pages:
- script:
- - pip install lektor
- - lektor build --output-path public
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml
deleted file mode 100644
index 50e8b7ccd46..00000000000
--- a/vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Full project: https://gitlab.com/pages/metalsmith
-image: node:4.2.2
-
-pages:
- cache:
- paths:
- - node_modules/
-
- script:
- - npm install -g metalsmith
- - npm install
- - make build
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml
deleted file mode 100644
index 9f4cc0574d6..00000000000
--- a/vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Full project: https://gitlab.com/pages/middleman
-image: ruby:2.3
-
-cache:
- paths:
- - vendor
-
-test:
- script:
- - apt-get update -yqqq
- - apt-get install -y nodejs
- - bundle install --path vendor
- - bundle exec middleman build
- except:
- - master
-
-pages:
- script:
- - apt-get update -yqqq
- - apt-get install -y nodejs
- - bundle install --path vendor
- - bundle exec middleman build
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml
deleted file mode 100644
index b469b316ba5..00000000000
--- a/vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Full project: https://gitlab.com/pages/nanoc
-image: ruby:2.3
-
-pages:
- script:
- - bundle install -j4
- - nanoc
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml
deleted file mode 100644
index 4762ec9acfd..00000000000
--- a/vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Full project: https://gitlab.com/pages/octopress
-image: ruby:2.3
-
-pages:
- script:
- - apt-get update -qq && apt-get install -qq nodejs
- - bundle install -j4
- - bundle exec rake generate
- - mv public .public
- - mv .public/octopress public
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml
deleted file mode 100644
index c5f3154f587..00000000000
--- a/vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Full project: https://gitlab.com/pages/pelican
-image: python:2.7-alpine
-
-pages:
- script:
- - pip install -r requirements.txt
- - pelican -s publishconf.py
- artifacts:
- paths:
- - public/