39 Commits

Author SHA1 Message Date
Klaus Baldermann
c52a64d62a Add "gitlab" icon and link.
icon copied from git@github.com:mmistakes/jekyll-theme-basically-basic.git
2017-06-09 14:04:28 +02:00
Achilleas Pipinellis
a96cfbfea3 Merge branch 'readme-improvements' into 'master'
Readme improvements

See merge request !17
2017-04-03 10:17:30 +00:00
Adam Voss
400fd40cfc Miscellaneous improvments to README 2017-03-10 14:40:43 -06:00
Adam Voss
f58aedc31d Updated README to consistently use bundle 2017-03-10 14:36:09 -06:00
Achilleas Pipinellis
177df024fb Merge branch 'productionEnvironment' into 'master'
Update README.md to specify production Jekyll configuration

See merge request !11
2017-03-10 16:50:17 +00:00
Adam Voss
f2989df305 Update .gitlab-ci.yml and README.md to specify production Jekyll configuration
If a user is using GitLab Pages it is most likely the user is using GitLab pages to publish a website not just stage a website that is published elsewhere.  If a user is publishing a website with Jekyll, they (and Jekyll themes/plugins) will expect that JEKYLL_ENV=production.  This commit provides that specification in `.gitlab-ci.yml`.

An examination of the existing repository showed this should not result in any change to the current rendering of the website.  However, the specification may be important for developers as explained in preceding commit.
2017-03-10 08:22:25 -06:00
Achilleas Pipinellis
49a5583696 Merge branch 'getting-started' into 'master'
Getting Started instructions added to README.md

See merge request !16
2017-03-10 14:14:50 +00:00
Adam Voss
0a9c9347c2 Getting Started instructions added to README.md 2017-03-10 08:01:13 -06:00
Achilleas Pipinellis
aa0095134a Merge branch 'lineEndingNormalization' into 'master'
Introduce end-of-line normalization

See merge request !14
2017-03-08 12:42:45 +00:00
Achilleas Pipinellis
9ff8d98340 Update GitLab Pages docs links 2017-03-01 12:29:07 +01:00
Adam Voss
a1cb43f3ef Introduce end-of-line normalization
This will prevent diff issues such as the one seen in merge request 11 when an editor changed the EOL for a file resulting in a useless diff.
2017-02-17 10:33:10 -06:00
Achilleas Pipinellis
34370cf348 Merge branch 'gemfile' into 'master'
Switch to using a Gemfile

Closes #8

See merge request !12
2017-02-11 10:23:30 +00:00
Adam Voss
4f70121c8a Switch to using a Gemfile 2017-02-10 16:45:26 -06:00
Achilleas Pipinellis
c93448c797 Minor typos 2016-04-05 21:47:23 +03:00
Achilleas Pipinellis
8240ef2ae8 Lower TOC 2016-04-05 21:46:16 +03:00
Achilleas Pipinellis
e120b00841 Merge branch 'ruby23' into 'master'
Ruby 2.3



See merge request !2
2016-04-05 18:35:52 +00:00
Achilleas Pipinellis
6f3ebcb689 Add a test job 2016-04-05 21:19:30 +03:00
Achilleas Pipinellis
cc910e0130 Bump to Ruby 2.3 2016-04-05 21:15:23 +03:00
Achilleas Pipinellis
a49a21d126 Exclude public dir 2016-04-05 21:14:06 +03:00
Achilleas Pipinellis
3511493f4e Update README 2016-04-05 21:13:23 +03:00
Achilleas Pipinellis
3df7a29cba Use / for url 2016-03-30 10:42:10 +00:00
Achilleas Pipinellis
d25bb9db1d Update version badge [ci skip] 2016-03-25 10:48:39 +00:00
Achilleas Pipinellis
a1ab993680 Merge branch 'master' into 'master'
Fix layout, improve README, upgrade Jekyll template

# Why?

- the layout was broken
- `.gitlab-ci.yml` had a unnecessary gem (redcarpet)
- the template was very old (probably Jekyll 2.4.0 or older)

# What did you do?

- I generated new Jekyll site locally (`jekyll new project`) using last Jekyll version (3.2.1)
- I added readme with basic instructions and fix doc-pages URL (was https://doc.gitlab.com/ee/pages/)
- I edited `_config.yml` url and baseurl to match the correct path and kept the same title as before ("Example Jekyll site using GitLab Pages")

# Results

_Before_

----

![pages-jekyll-layout-before](/uploads/9f5342c14da50333917b02ea997c0c8e/pages-jekyll-layout-before.png)

----

_After_

----

![pages-jekyll-layout-fix](/uploads/495f48f87d074fdf13e8a00e2922e014/pages-jekyll-layout-fix.png)

----

# Why WIP?

Because the changes are significant in terms of content. We could just fix the urls on `_config.yml` and the link to doc-pages on readme and we'd be good to go.

# README:

----

![Jekyll Version](https://img.shields.io/badge/Jekyll-3.1.2-red.svg)
![Build Status](https://gitlab.com/pages/jekyll/badges/master/build.svg)

----

Example [Jekyll] site using GitLab Pages. Read more at http://doc.gitlab.com/ee/pages/README.html

-----
# Theme: Jekyll 3 Default

# Original source:

This project was created with [Jekyll] v.3.1.2 default template by running `jekyll new project` locally. 
After that, the project was pushed to this repository with the following configurations:

- GitLab CI config: [`.gitlab-ci.yml`]
- Gitignore: [`.gitignore`]
- Jekyll config: [`_config.yml`]

# Building locally

_**Note:** We assume you already have [Jekyll 3.1.2][jek-312] installed and up and running on your computer._

To work locally with this project, there are a few options. But let's keep it simple:

- Fork, clone or download this project
- Adjust [`_config.yml`] according to your project
- Preview your project: `jekyll serve`

# GitLab User or Group Page

To use this project as your user/group website, you will need one additional step: just rename your project to `namespace.gitlab.io`, where `namespace` is your `username` or `groupname`. This can be done by navigating to `Project` -> `Settings`.

# Forked projects

If you forked this project for your own use, please go to `Project` -> `Settings` and remove the forking relationship, which won't be necessary in this case. 

Enjoy!

[Jekyll]: http://jekyllrb.com/
[jek-312]: https://rubygems.org/gems/jekyll/versions/3.1.2
[`_config.yml`]: https://gitlab.com/pages/jekyll/blob/master/_config.yml
[`.gitlab-ci.yml`]: https://gitlab.com/pages/jekyll/blob/master/.gitlab-ci.yml
[`.gitignore`]: https://gitlab.com/pages/jekyll/blob/master/.gitignore

----

cc/ @axil 

See merge request !1
2016-03-25 08:46:12 +00:00
Virtua Creative
61bdeb8724 minor adjustments - readme.md 2016-03-24 20:59:51 -03:00
Virtua Creative
81c7f12500 exclude readme.md from the builds 2016-03-24 20:57:10 -03:00
Virtua Creative
f424a6795d fix doc-pages url 2016-03-24 20:29:16 -03:00
Virtua Creative
62466a2bf6 fix url 2016-03-24 20:06:01 -03:00
Virtua Creative
b06039df62 update url for Pages group 2016-03-24 20:00:37 -03:00
Virtua Creative
ea70058276 updating readme 2016-03-24 19:05:09 -03:00
Virtua Creative
c84d2f2a51 fix links 2016-03-24 18:50:07 -03:00
Virtua Creative
1928bc46a9 full replacement 2016-03-24 15:50:36 -03:00
Virtua Creative
0142a85cee jekyll 3.2.1 default 2016-03-24 15:49:02 -03:00
Achilleas Pipinellis
be20e2fcee Add site URL 2016-03-23 10:39:05 +00:00
Douwe Maan
b16402e7b5 Fix link to docs 2015-12-22 10:56:23 +00:00
Achilleas Pipinellis
9b1f11ca6e Install redcarpet 2015-12-17 21:59:56 +00:00
Achilleas Pipinellis
bd91d4499f Add README 2015-12-17 21:55:24 +00:00
Kamil Trzcinski
1ffb1f4c93 Install jekyll in gitlab-ci.yml 2015-12-17 13:01:47 +01:00
Kamil Trzcinski
c6e3b66fd8 Add .gitlab-ci.yml 2015-12-17 12:49:09 +01:00
Kamil Trzcinski
065b20cef4 Create jekyll site 2015-12-17 12:46:19 +01:00