diff --git a/.gitignore b/.gitignore index d0a9ef0a35..66af8ad4a9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ _site .bundle _config_write.yml log/ +.DS_Store diff --git a/Gemfile b/Gemfile index f64467924a..8a64ccf9d2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,21 +1,21 @@ source 'https://rubygems.org' ruby RUBY_VERSION -gem 'jekyll' -gem 'rake' -gem 'colorize' -gem 'html-proofer' +gem 'jekyll', '3.7.2' +gem 'rake', '12.3.0' +gem 'colorize', '0.8.1' +gem 'html-proofer', '3.8.0' gem 'capistrano', '3.8.1', require: false -gem 'capistrano-rbenv', require: false -gem 'capistrano-bundler', require: false +gem 'capistrano-rbenv', '2.1.3', require: false +gem 'capistrano-bundler', '1.3.0', require: false group :jekyll_plugins do - gem 'jekyll-feed' - gem 'jekyll-admin' - gem 'bourbon' - gem 'neat' - gem 'rouge' - gem 'jekyll-twitter-plugin' + gem 'jekyll-feed', '0.9.2' + gem 'jekyll-admin', '0.7.0' + gem 'bourbon', '5.0.0' + gem 'neat', '2.1.0' + gem 'rouge', '3.1.0' + gem 'jekyll-twitter-plugin', '2.0.0' gem 'jekyll-paginate-v2', '1.9.0' end diff --git a/Gemfile.lock b/Gemfile.lock index b4adac6eef..889aba3231 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) - backports (3.11.0) + backports (3.11.1) bourbon (5.0.0) sass (~> 3.4) thor (~> 0.19) @@ -46,9 +46,9 @@ GEM typhoeus (~> 1.3) yell (~> 2.0) http_parser.rb (0.6.0) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) - jekyll (3.7.0) + jekyll (3.7.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -83,7 +83,7 @@ GEM ruby_dep (~> 1.2) mercenary (0.3.6) mini_portile2 (2.3.0) - minitest (5.11.1) + minitest (5.11.2) multi_json (1.13.1) neat (2.1.0) sass (~> 3.4) @@ -141,20 +141,20 @@ PLATFORMS ruby DEPENDENCIES - bourbon + bourbon (= 5.0.0) capistrano (= 3.8.1) - capistrano-bundler - capistrano-rbenv - colorize - html-proofer - jekyll - jekyll-admin - jekyll-feed + capistrano-bundler (= 1.3.0) + capistrano-rbenv (= 2.1.3) + colorize (= 0.8.1) + html-proofer (= 3.8.0) + jekyll (= 3.7.2) + jekyll-admin (= 0.7.0) + jekyll-feed (= 0.9.2) jekyll-paginate-v2 (= 1.9.0) - jekyll-twitter-plugin - neat - rake - rouge + jekyll-twitter-plugin (= 2.0.0) + neat (= 2.1.0) + rake (= 12.3.0) + rouge (= 3.1.0) tzinfo-data RUBY VERSION diff --git a/Jenkinsfile b/Jenkinsfile index 6fe32e104e..66b92ea27d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,24 @@ pipeline { ''' } } - stage('Deploy') { + stage('Deploy Staging') { + when { branch 'develop' } + steps { + sh ''' + source ~/.bash_profile + export PATH=$PATH:/usr/local/bin:$HOME/.rbenv/bin:$HOME/.rbenv/shims + eval "$(rbenv init -)" + rbenv local 2.4.2 + gem install bundler + bundle install + rbenv rehash + eval `ssh-agent -s` + ssh-add + bundle exec cap staging deploy --trace + ''' + } + } + stage('Deploy Live') { when { branch 'master' } steps { sh ''' diff --git a/Rakefile b/Rakefile index 1a031f624a..c49f59456c 100644 --- a/Rakefile +++ b/Rakefile @@ -269,7 +269,7 @@ task :test_files do './.sass_cache', './.tweet-cache', './assets/font-awesome', - './assets/fonts_new', + './assets/fonts', './vendor']).run end diff --git a/_config.yml b/_config.yml index e235d5d1ae..17e78838bb 100644 --- a/_config.yml +++ b/_config.yml @@ -46,6 +46,10 @@ exclude: - Capfile - _pages/url-map - resources + - README.md + - run_tests.sh + - config/ + - log/ feed: path: /blog/feed.xml diff --git a/_data/events.yml b/_data/events.yml index 852e70c296..92450e98f7 100644 --- a/_data/events.yml +++ b/_data/events.yml @@ -1,8 +1,27 @@ -- title: WIK HTWK Leipzig - description: We are exhibiting at this event. - link: http://www.wikway.de/wik-leipzig-htwk - location: 29. Nov 2017
10am - 4pm
HTKW Leipzig - Foyer NIEPER-Bau
Karl-Liebknecht-Straße 134
04277 Leipzig -- title: academix Thüringen - description: We are exhibiting at this event. - link: http://www.thaff-thueringen.de/academix-thueringen/ - location: 2. Dez 2017
10am - 6pm
Messe Erfurt
Gothaer Straße 34
99084 Erfurt +- title: Meet the team + image: meet-the-team.png + video: https://www.youtube.com/watch?v=FbE2FyqTJCY + +- title: Hackathon 2017 + image: hackathon_2017_2.png + video: https://www.youtube.com/watch?v=j-qMUo8_ChQ + +- title: R&D day 2016 + image: rnd_2016_1.jpg + video: https://www.youtube.com/watch?v=wNQ7B0rIB3g + +- title: Hackathon 2016 + image: rnd_2016_2.jpg + video: https://www.youtube.com/watch?v=2UdyQma76IA + +- title: Lunch in the park + image: lunch-in-the-park.jpg + +- title: Tech meetup & pizzaaaa + image: meetup.jpg + +- title: Great team workshop + image: you_2016_1.jpg + +- title: After-work fun + image: you_2016_2.jpg diff --git a/_data/exhibitions.yml b/_data/exhibitions.yml new file mode 100644 index 0000000000..dad55e647c --- /dev/null +++ b/_data/exhibitions.yml @@ -0,0 +1,20 @@ +- title: JeffConf Hamburg 2018 + description: We are participating at this event. + link: https://hamburg.jeffconf.com/agenda + date: 16. Feb 2018 + time: + address: Altonaer Museum
Museumstraße 23
22765 Hamburg + +- title: Ruby Unconference + description: We are sponsoring this event. + link: + date: 5. - 6. May 2018 + time: + address: Hamburg + +- title: Scrum Alliance Gathering + description: We are participating at this event. + link: + date: 8. - 10. Oct 2018 + time: + address: ExCeL London
Royal Victoria Dock, 1 Western Gateway
London E16 1XL, UK diff --git a/_includes/components/arrow-up.html b/_includes/components/arrow-up.html index f2019b855a..92f6e046cb 100644 --- a/_includes/components/arrow-up.html +++ b/_includes/components/arrow-up.html @@ -1 +1,3 @@ - + + + diff --git a/_includes/components/post-card.html b/_includes/components/post-card.html index 0fdab6ae95..fa7ae0849d 100644 --- a/_includes/components/post-card.html +++ b/_includes/components/post-card.html @@ -1,13 +1,21 @@ -
- -
-
-

{{ include.title }}

-