Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-10-07 06:46:54 +0300
committerConnor Shea <connor.james.shea@gmail.com>2016-10-07 06:46:54 +0300
commit4e20e4a7c352bddbc4537197a25b45fd8ecb7b69 (patch)
treed68cef621a039b08c3b162d5cc6e2ec3aad75c00
parentfbd1f448491113ad518ab44e7847a48f18d92699 (diff)
Change output directory to public.
-rw-r--r--.gitignore1
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--Gemfile.lock2
-rw-r--r--nanoc.yaml2
4 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index da214e24..4a0a6ad9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
# Default location for output, needs to match output_dir's value found in config.yaml
output/
+public/
# Temporary file directory
tmp/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5949cb2e..dd9b1520 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,6 @@ pages:
- nanoc
artifacts:
paths:
- - output
+ - public
only:
- master
diff --git a/Gemfile.lock b/Gemfile.lock
index e5294731..d3ba7eed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
adsf (1.2.1)
rack (>= 1.0.0)
diff --git a/nanoc.yaml b/nanoc.yaml
index b7dd1b36..a8aa278b 100644
--- a/nanoc.yaml
+++ b/nanoc.yaml
@@ -11,7 +11,7 @@ text_extensions: [ 'adoc', 'asciidoc', 'atom', 'coffee', 'css', 'erb', 'haml', '
# The path to the directory where all generated files will be written to. This
# can be an absolute path starting with a slash, but it can also be path
# relative to the site directory.
-output_dir: output
+output_dir: public
# A list of index filenames, i.e. names of files that will be served by a web
# server when a directory is requested. Usually, index files are named