Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell

.gitlab-ci.yml

+before_script:
+  - export PATH=~/bin:/usr/local/bin:/usr/bin:/bin
+  - gem install bundler
+  - cp config.yml.example config.yml
+  - bundle install
+
+rspec:
+  script:
+    - bundle exec rspec spec
+  tags:
+    - git-annex
+    - ruby
+  except:
+    - tags
+
+rubocop:
+  script: 
+    - bundle exec rubocop
+  tags:
+    - ruby
+  except:
+    - tags

README.md

@@ -40,7 +40,7 @@ An overview of the four cases described above:
 
 ## Code status
 
-[![CI](http://ci.gitlab.org/projects/4/status.png?ref=master)](http://ci.gitlab.org/projects/4?ref=master)
+[![CI](https://ci.gitlab.org/projects/4/status.png?ref=master)](https://ci.gitlab.org/projects/4?ref=master)
 [![Build Status](https://semaphoreapp.com/api/v1/projects/a71ddd46-a9cc-4062-875e-7ade19a44927/243336/badge.png)](https://semaphoreapp.com/gitlabhq/gitlab-shell)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlab-shell.png)](https://codeclimate.com/github/gitlabhq/gitlab-shell)
 [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlab-shell/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlab-shell)
@@ -91,7 +91,7 @@ List repos:
 Import repo:
 
     # Default timeout is 2 minutes
-    ./bin/gitlab-projects import-project randx/six.git https://github.com/randx/six.git 
+    ./bin/gitlab-projects import-project randx/six.git https://github.com/randx/six.git
 
     # Override timeout in seconds
     ./bin/gitlab-projects import-project randx/six.git https://github.com/randx/six.git 90
@@ -114,7 +114,7 @@ Remove branch:
 
 Create tag (lightweight & annotated):
 
-    ./bin/gitlab-projects create-tag gitlab/gitlab-ci.git v3.0.0 3-0-stable 
+    ./bin/gitlab-projects create-tag gitlab/gitlab-ci.git v3.0.0 3-0-stable
     ./bin/gitlab-projects create-tag gitlab/gitlab-ci.git v3.0.0 3-0-stable 'annotated message goes here'
 
 Remove tag:

config.yml.example

+#
+# If you change this file in a Merge Request, please also create
+# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+#
+
 # GitLab user. git by default
 user: git