summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added missing RequestStoreapplication_settingsKamil Trzcinski2015-07-302-0/+3
|
* Added Application SettingsKamil Trzcinski2015-07-3012-12/+140
|
* Merge branch 'truncate-commitmsg-at-newline' into 'master'Kamil Trzciński2015-07-303-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | Truncate commit messages after subject line in table Commit messages are now additionally truncated after the first line. Before, a commit message's body was attached behind the subject which made messages hardly readable in some cases. ![gitlab-ci-truncate-commitmsg](https://gitlab.com/dgerhardt/gitlab-ci/uploads/a0c601eb1abbce7a7b9e4e0e3f16f303/gitlab-ci-truncate-commitmsg.png) See merge request !213
| * Truncate commit messages after subject line in tableDaniel Gerhardt2015-07-293-2/+6
| | | | | | | | | | | | Commit messages are now additionally truncated after the first line. Before, a commit message's body was attached behind the subject which made messages hardly readable in some cases.
* | Merge branch 'fix_inline_edit_runner_description' into 'master'Kamil Trzciński2015-07-302-6/+7
|\ \ | |/ |/| | | | | | | | | | | | | Fix inline edit runner-description Fixes: #217 Replaced .show and .hide with .removeClass('hide') and .addClass('hide') (Like done for #192 in MR 177) See merge request !206
| * Fix inline edit runner-descriptionMartin Kaufmann2015-07-232-6/+7
| | | | | | | | Replaced .show and .hide with .removeClass('hide') and .addClass('hide') (Like done for #192 in MR 177)
* | Update docker executor usage documentationKamil Trzcinski2015-07-291-2/+2
| |
* | Update CHANGELOGKamil Trzcinski2015-07-292-1/+4
| |
* | Merge branch 'ci-config-docker-support' into 'master'Kamil Trzciński2015-07-292-5/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust CI config to support Docker executors A shell script (based on the one for GitLab CE) has been added to support Docker executors. Tags have been added to make sure builds are only executed on appropriate runners. This makes it possible to test forks of the GitLab CI repository on public runners. Previously, builds failed with the following error: ``` $ bundle --without postgres /builds/eldamir/gitlab-ci.sh: line 29: bundle: command not found ERROR: Build failed with: exit code 127 ``` See merge request !212
| * | Adjust CI config to support Docker executorsDaniel Gerhardt2015-07-252-5/+32
| | | | | | | | | | | | | | | | | | A shell script (based on the one for GitLab CE) has been added to support Docker executors. Tags have been added to make sure builds are only executed on appropriate runners.
* | | Don't send notifications for jobs with allow_failure setKamil Trzcinski2015-07-294-0/+7
|/ /
* | Merge branch 'detail-two-possibilities-for-scripts' into 'master' Kamil Trzciński2015-07-241-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Detail that people can use script to do `rake rspec` but also to call a `tests.sh` See merge request !209
| * | Fix feedbackSytse Sijbrandij2015-07-241-2/+2
| | |
| * | Detail that people can use script to do `rake rspec` but also to call a ↵Sytse Sijbrandij2015-07-241-2/+3
|/ / | | | | | | `tests.sh`
* | Merge commit '19c8544be6c79ed04745cacaa84008c34aa2ef5a'Kamil Trzcinski2015-07-241-1/+2
|\ \ | | | | | | | | | | | | * commit '19c8544be6c79ed04745cacaa84008c34aa2ef5a': update changelog
| * \ Merge branch 'update_changelog1' into 'master' Valery Sizov2015-07-231-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update changelog See merge request !167
| | * | update changelogValery Sizov2015-07-231-1/+3
| |/ /
* | | Merge branch 'spelling' into 'master'Kamil Trzciński2015-07-241-30/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bunch of spelling/grammar mistakes. There were many spelling mistakes, which ultimately distracted from the content it was describing. This commit fixes all that I could find, and rewords some sentences to improve clarity See merge request !211
| * | | Fixes a bunch of spelling/grammar mistakes.Ruben Nielsen2015-07-241-30/+32
|/ / / | | | | | | | | | | | | | | | There were many spelling mistakes, which ultimately distracted from the content it was describing. This commit fixes all that I could find, and rewords some sentences to improve clarity
* | | Ask people to contribute guides.Sytse Sijbrandij2015-07-231-1/+2
| | |
* | | Merge branch 'fix-doc-link' into 'master' Valery Sizov2015-07-232-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid link to doc.gitlab.com /cc @vsizov See merge request !207
| * | | Fix invalid link to doc.gitlab.comfix-doc-linkKamil Trzcinski2015-07-232-1/+3
|/ / /
* | | Merge commit 'a7d59ed9b87f24246f3907a5fe8a1b472e3fa740'Kamil Trzcinski2015-07-2321-630/+532
|\ \ \ | |/ / |/| / | |/ | | | | * commit 'a7d59ed9b87f24246f3907a5fe8a1b472e3fa740': Fix rendering issues Rework CI documentation by adding informations about YAML, the use of Docker images and building them
| * Merge branch 'rework-docs' into 'master' Kamil Trzciński2015-07-2221-630/+532
| |\ | | | | | | | | | | | | | | | | | | Update CI documentation to include complete YAML syntax, Docker features and use of Variables covered /cc @JobV @sytses See merge request !205
| | * Fix rendering issuesrework-docsKamil Trzcinski2015-07-222-67/+72
| | |
| | * Rework CI documentation by adding informations about YAML, the use of Docker ↵Kamil Trzcinski2015-07-2221-630/+527
| |/ | | | | | | images and building them
* | Merge branch 'fix-permission-escalation' into 'master' Valery Sizov2015-07-235-6/+24
|\ \ | |/ |/| | | | | | | | | | | | | | | Fix permission escalation This fixes permission escalation as described here: https://gitlab.com/gitlab-org/gitlab-ci/issues/225 As this is security fix this commit should be cherry-picked to 7.13: https://dev.gitlab.org/gitlab/gitlab-ci/commit/02982e545744925a6ce8238ed354abdd8e6c835f See merge request !165
| * Fix: user could steal specific runnerKamil Trzcinski2015-07-225-6/+24
|/ | | | | | - check if user has manage access to project - don't cache result of authorized_projects, because it's serialised with User object - clear user sessions
* Merge branch 'contributing_spelling' into 'master'Kamil Trzciński2015-07-211-1/+1
|\ | | | | | | | | | | | | | | fix small spelling issue in CONTRIBUTING.md Fix mispelling of 'submission' in contributing doc. See merge request !201
| * correct spelling of submissionWarren Volz2015-07-161-1/+1
| |
* | Merge branch 'fix-gitlab-ci-url' into 'master'Kamil Trzciński2015-07-201-1/+1
|\ \ | | | | | | | | | | | | | | | Point to correct GitLab CI url. See merge request !202
| * | Point to correct GitLab CI url.Achilleas Pipinellis2015-07-171-1/+1
| |/
* | Merge branch 'fix_upgrader_version_detect' into 'master'Kamil Trzciński2015-07-202-8/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix upgrader version detection This ports changes from the gitlab upgrader script to gitlabci. With the changes the upgrader script now works correct with versions that contain more than 1 digit. See merge request !203
| * | port version matching code in upgrader lib from gitlabWarren Volz2015-07-172-8/+24
| |/ | | | | | | | | | | | | - fixes upgrader script not working with v7.1x versions - rspec test cases from gitlab for upgrader lib - rename gitlab to gitlabci - use real data for gitlabci3 version check
* | Fix CI status badge in READMEDmitriy Zaporozhets2015-07-191-2/+2
|/
* Version 7.13.0.rc2v7.13.0.rc2Valery Sizov2015-07-151-1/+1
|
* Merge branch 'secrets-perm' into '7-13-stable'Valery Sizov2015-07-153-4/+3
|\ | | | | | | | | | | Create config/secrets.yml with 0600 See merge request !200
| * Create config/secrets.yml with 0600secrets-permKamil Trzcinski2015-07-153-4/+3
| |
* | Version 7.13.0.rc1v7.13.0.rc1Valery Sizov2015-07-141-1/+1
|/
* Merge branch 'update-docs' into 'master'Job van der Voort2015-07-143-4/+26
|\ | | | | | | | | | | | | | | Update install and update documentation for 7.13 @JobV Please push directly to this branch and merge if ok. See merge request !199
| * small update to docsJob van der Voort2015-07-142-12/+12
| |
| * Update documentationupdate-docsKamil Trzcinski2015-07-143-5/+27
|/
* Merge branch 'build-types' into 'master'Kamil Trzciński2015-07-1318-199/+213
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to specify flexible list of types in yaml First part of flexible pipeline build in GitLab CI Having following `.gitlab-ci.yml`: ``` types: - test - deploy - notify rspec: script: "rspec" rubocop: script: "rubocop" staging: type: deploy script: "echo deploy" only: - master production: type: deploy script: "echo production" only: - tags dockerhub: type: notify script: "curl http://docker/hub/web/hook" downstream: type: notify script: "curl http://build/downstream/jobs" ``` GitLab CI will trigger two test jobs in parallel, when finished it will trigged either staging or production, when finished it will trigger dockerhub and downstream in parallel. The UI (screenshots are not for above YAML): ![Screen_Shot_2015-07-10_at_15.56.26](https://gitlab.com/gitlab-org/gitlab-ci/uploads/1f714b73772cf0d44168fb8e20e35561/Screen_Shot_2015-07-10_at_15.56.26.png) ![Screen_Shot_2015-07-10_at_15.57.19](https://gitlab.com/gitlab-org/gitlab-ci/uploads/fc9f458f2ca517d923a4382466fa99eb/Screen_Shot_2015-07-10_at_15.57.19.png) TODO: - [x] Implement in CI - [x] Specs - [x] Changelog - [x] CI tests - [ ] Documentation /cc @vsizov @sytses @dzaporozhets See merge request !198
| * Fix specsbuild-typesKamil Trzcinski2015-07-103-8/+12
| |
| * Satisfy rubocopKamil Trzcinski2015-07-101-1/+1
| |
| * Update CHANGELOGKamil Trzcinski2015-07-101-0/+1
| |
| * Allow to specify flexible list of types in yamlKamil Trzcinski2015-07-1016-200/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` types: - test - deploy - notify rspec: script: "rspec" rubocop: script: "rubocop" staging: type: deploy script: "echo deploy" only: - master production: type: deploy script: "echo production" only: - tags dockerhub: type: notify script: "curl http://docker/hub/web/hook" downstream: type: notify script: "curl http://build/downstream/jobs" ``` This will trigger two test jobs in parallel, when finished it will trigged either staging or production, when finished it will trigger dockerhub and downstream in parallel.
* | Merge branch 'encrypt-variables' into 'master'Kamil Trzciński2015-07-138-5/+82
|\ \ | | | | | | | | | | | | | | | | | | | | | Encrypt variables /cc @dzaporozhets @jacobvosmaer @vsizov See merge request !187
| * | Fix CHANGELOGKamil Trzcinski2015-07-131-1/+1
| | |
| * | Use secrets.db_key_base instead of config.secret_key_baseKamil Trzcinski2015-07-131-1/+1
| | |
View Lorry Controller Status