diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-07-16 12:14:49 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-07-16 12:14:49 +0200 |
| commit | 7b692799adde84433a37b250c5d7e36483fbf5f7 (patch) | |
| tree | cb749bd27afb3182cdc715e696c1d34d831811ef | |
| parent | 64996dbb6dc869d9aeb7032bad29c2775cfd8297 (diff) | |
| parent | a33818958222e5e6ef405a64608c37d7452a4b65 (diff) | |
| download | gitlab-shell-7b692799adde84433a37b250c5d7e36483fbf5f7.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | config.yml.example | 5 |
3 files changed, 30 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..fa4f2d4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,22 @@ +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 @@ -40,7 +40,7 @@ An overview of the four cases described above: ## Code status -[](http://ci.gitlab.org/projects/4?ref=master) +[](https://ci.gitlab.org/projects/4?ref=master) [](https://semaphoreapp.com/gitlabhq/gitlab-shell) [](https://codeclimate.com/github/gitlabhq/gitlab-shell) [](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: diff --git a/config.yml.example b/config.yml.example index 9dc30db..43d6e85 100644 --- a/config.yml.example +++ b/config.yml.example @@ -1,3 +1,8 @@ +# +# 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 |