1. 21 Sep, 2017 3 commits
  2. 22 Aug, 2017 4 commits
  3. 21 Aug, 2017 12 commits
  4. 28 Jul, 2017 7 commits
  5. 27 Jul, 2017 1 commit
  6. 14 Jun, 2017 4 commits
  7. 13 Jun, 2017 2 commits
  8. 06 Jun, 2017 3 commits
  9. 01 May, 2017 4 commits
    • Merge branch 'hotfix/v1.4.6' into develop · 0c2bb311
      # Conflicts:
      #	dist/apache-php56/files/gitlab/gitlab.yml
      #	dist/apache-php70/files/gitlab/gitlab.yml
      #	dist/apache/files/gitlab/gitlab.yml
      #	dist/base/files/gitlab/gitlab.yml
      #	dist/bind/files/gitlab/gitlab.yml
      #	dist/cloudflare-railgun/files/gitlab/gitlab.yml
      #	dist/docker/files/gitlab/gitlab.yml
      #	dist/elasticsearch/files/gitlab/gitlab.yml
      #	dist/gitlab-ci-multi-runner/Dockerfile
      #	dist/gitlab-ci-multi-runner/files/gitlab/gitlab.yml
      #	dist/gitlab/files/gitlab/gitlab.yml
      #	dist/golang/files/gitlab/gitlab.yml
      #	dist/icinga2/files/gitlab/gitlab.yml
      #	dist/java/files/gitlab/gitlab.yml
      #	dist/kibana/files/gitlab/gitlab.yml
      #	dist/logstash-forwarder/files/gitlab/gitlab.yml
      #	dist/logstash/files/gitlab/gitlab.yml
      #	dist/mariadb/files/gitlab/gitlab.yml
      #	dist/memcached/files/gitlab/gitlab.yml
      #	dist/mongodb/files/gitlab/gitlab.yml
      #	dist/nextcloud/files/gitlab/gitlab.yml
      #	dist/nginx-php56/files/gitlab/gitlab.yml
      #	dist/nginx-php70/files/gitlab/gitlab.yml
      #	dist/nginx/files/gitlab/gitlab.yml
      #	dist/node/Dockerfile
      #	dist/node/files/gitlab/gitlab.yml
      #	dist/owncloud/files/gitlab/gitlab.yml
      #	dist/php56/files/gitlab/gitlab.yml
      #	dist/php70/files/gitlab/gitlab.yml
      #	dist/postgres/files/gitlab/gitlab.yml
      #	dist/puppet-client/files/gitlab/gitlab.yml
      #	dist/redis/files/gitlab/gitlab.yml
      #	dist/ruby/files/gitlab/gitlab.yml
      #	dist/squid/files/gitlab/gitlab.yml
      #	dist/symfony2/Dockerfile
      #	dist/symfony2/files/gitlab/gitlab.yml
      #	dist/symfony3/Dockerfile
      #	dist/symfony3/files/gitlab/gitlab.yml
      #	dist/tomcat/files/gitlab/gitlab.yml
      #	dist/wordpress-nginx-w3tc/files/gitlab/gitlab.yml
      #	dist/wordpress/files/gitlab/gitlab.yml
      Ueli Banholzer committed