summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Require the variable key to be set and uniquevariable-fixKamil Trzcinski2015-08-191-0/+3
|
* Fix typo in modal titleStan Hu2015-08-181-2/+2
|
* Prefer `failed` commit status over `skipped` if no builds were createdbroken-yaml-errorsKamil Trzcinski2015-08-061-7/+5
|
* Fix broken yaml error savingKamil Trzcinski2015-08-061-1/+1
|
* Merge branch 'yaml-variables' into 'master' Kamil Trzciński2015-08-051-1/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support yaml variables This MR introduces ability to define variables from YAML. ```yaml variables: DB_NAME: postgres test: script: echo $DB_NAME ``` The variables are passed using the same API as Secure Variables. The API introduces additional parameter: public. All variables defined in YAML are marked as public. The GitLab Runner when detects public variables will pass them to the services. This makes it easy to fine tune linked services to for example define database name. ```yaml services: - postgres variables: POSTGRES_DB: gitlab ``` The above example will run [postgres](https://registry.hub.docker.com/u/library/postgres/) and pass POSTGRES_DB to postgres container making it to create `gitlab` database instead of default `postges`. **Note:** All variables will passed to all service containers. It's not designed to distinguish which variable should go where. /cc @sytses @vsizov @dzaporozhets See merge request !227
| * Satisfy rubocopKamil Trzcinski2015-08-051-2/+2
| |
| * Added support for YAML-defined variablesKamil Trzcinski2015-08-051-1/+19
| |
* | Merge branch 'service-testing' into 'master' Kamil Trzciński2015-08-056-46/+42
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Fix service testing Fixes: - https://gitlab.com/gitlab-org/gitlab-ci/issues/248 - https://gitlab.com/gitlab-org/gitlab-ci/issues/208 /cc @vsizov See merge request !221
| * Fix rubocopservice-testingKamil Trzcinski2015-08-033-18/+18
| |
| * Fix service testingKamil Trzcinski2015-08-036-46/+42
| |
* | Merge branch 'skipped_commit' into 'master' Kamil Trzciński2015-08-052-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits with [ci skip] have special skipped status ![Screen_Shot_2015-07-30_at_14.02.50](https://gitlab.com/gitlab-org/gitlab-ci/uploads/f200af385679b564cd15d730bd4ccd20/Screen_Shot_2015-07-30_at_14.02.50.png) + Commits with [ci skip] are marked as skipped + Commits without builds are marked as skipped Resolution for: + https://dev.gitlab.org/gitlab/gitlab-ci/issues/264 + https://dev.gitlab.org/gitlab/gitlab-ci/issues/266 This requires CE update: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1073 /cc @vsizov @sytses See merge request !216
| * | Commits without builds are marked as skippedKamil Trzcinski2015-08-051-1/+1
| | |
| * | Commits with [ci skip] have special skipped statusKamil Trzcinski2015-08-052-0/+6
| | |
* | | Merge branch 'rename-type-to-stage' into 'master' Kamil Trzciński2015-08-056-22/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Rename type to stage However, make the `type` and `types` as alias for `stage` and `stages`. /cc @vsizov @sytses See merge request !222
| * | Rename create_builds_for_type to create_builds_for_stage in Commit modelKamil Trzcinski2015-08-051-3/+3
| | |
| * | Update db/schemaKamil Trzcinski2015-08-031-1/+1
| | |
| * | Rename all occurrences of type to stageKamil Trzcinski2015-08-035-21/+21
| | |
* | | Fix broken specsaccess-token-apiKamil Trzcinski2015-08-041-1/+1
| | |
* | | Refactor GitLab API usage to use either access_token or private_tokenKamil Trzcinski2015-08-045-27/+20
|/ /
* | Merge branch 'truncate-fix' into 'master' Kamil Trzciński2015-08-031-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix truncate_first_line if message is nil Fixes https://gitlab.com/gitlab-org/gitlab-ci/issues/255 /cc @jacobvosmaer See merge request !217
| * | Fix truncate_first_line if message is niltruncate-fixKamil Trzcinski2015-08-031-1/+1
| |/
* | Fix broken specsuser-avatarKamil Trzcinski2015-08-031-0/+4
| |
* | Use avatars from GitLabKamil Trzcinski2015-08-036-14/+49
|/ | | | Rewrite Gravatar URLs if needed in order to have images in different size
* Merge branch 'application_settings' into 'master' Kamil Trzciński2015-07-306-8/+97
|\ | | | | | | | | | | | | | | | | | | | | Added Application Settings This moves some of the settings from application.yml to Admin page. ![Screen_Shot_2015-07-30_at_12.22.27](https://gitlab.com/gitlab-org/gitlab-ci/uploads/d37aa0003d9afaeb85aa350bb02e6f07/Screen_Shot_2015-07-30_at_12.22.27.png) /cc @sytses @vsizov See merge request !215
| * Fix specsKamil Trzcinski2015-07-301-1/+2
| |
| * Added Application SettingsKamil Trzcinski2015-07-306-8/+96
| |
* | Merge branch 'image-alt-text' into 'master'Kamil Trzciński2015-07-303-3/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Do not use image's file name as alternative text `image_tag` by default uses the image's file name for the img tag's alt attribute. This is not preferable in many cases. E.g. it clutters the UI with a long hash string if a gravatar could not be loaded. To fix this, the `alt` option is set for `image_tag` calls. ![gitlab-ci-img-alt](https://gitlab.com/dgerhardt/gitlab-ci/uploads/2699d149983912e458e2375fe9732b0d/gitlab-ci-img-alt.png) See merge request !214
| * Do not use image's file name as alternative textDaniel Gerhardt2015-07-303-3/+3
| | | | | | | | | | | | | | | | `image_tag` by default uses the image's file name for the img tag's alt attribute. This is not preferable in many cases. E.g. it clutters the UI with a long hash string if a gravatar could not be loaded. To fix this, the `alt` option is set for `image_tag` calls.
* | Merge branch 'truncate-commitmsg-at-newline' into 'master'Kamil Trzciński2015-07-302-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-2/+5
| |/ | | | | | | | | | | 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-301-4/+4
|\ \ | |/ |/| | | | | | | | | | | | | 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-231-4/+4
| | | | | | | | Replaced .show and .hide with .removeClass('hide') and .addClass('hide') (Like done for #192 in MR 177)
* | Don't send notifications for jobs with allow_failure setKamil Trzcinski2015-07-294-0/+7
| |
* | Fix invalid link to doc.gitlab.comfix-doc-linkKamil Trzcinski2015-07-231-1/+2
| |
* | Fix: user could steal specific runnerKamil Trzcinski2015-07-221-1/+4
|/ | | | | | - 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
* Point to correct GitLab CI url.Achilleas Pipinellis2015-07-171-1/+1
|
* Merge branch 'build-types' into 'master'Kamil Trzciński2015-07-139-86/+78
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |
| * Allow to specify flexible list of types in yamlKamil Trzcinski2015-07-108-87/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` 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.
* | Use secrets.db_key_base instead of config.secret_key_baseKamil Trzcinski2015-07-131-1/+1
| |
* | Fix annotationsKamil Trzcinski2015-07-131-1/+1
| |
* | Encrypt variables with attr_encryptedKamil Trzcinski2015-07-131-4/+9
| |
* | Merge branch 'secrets-yaml' into 'master'Kamil Trzciński2015-07-131-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | Use config/secrets.yml to store session secret and database encryption secret I took the approach that config/secrets.yml is generated when key is not found. /cc @vsizov @jacobvosmaer See merge request !195
| * Fix specsKamil Trzcinski2015-07-101-1/+1
| |
* | Merge branch 'coverage-calc' into 'master'Kamil Trzciński2015-07-101-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Use builds_without_retry to calculate average coverage /cc @vsizov See merge request !197
| * | Use builds_without_retry to calculate average coveragecoverage-calcKamil Trzcinski2015-07-101-2/+2
| |/
* | Disable link to runner if it's not assigned to specific project: fixes 404 ↵runner-linkKamil Trzcinski2015-07-101-1/+3
|/ | | | when clicking on available runner from project's page
* Merge branch 'builds-path' into 'master'Kamil Trzciński2015-07-091-6/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Make configurable builds_path in application.yml We have a new option in `application.yml`: ``` gitlab_ci: builds_path: builds/ ``` /cc @marin @vsizov See merge request !193
| * Make configurable builds_path in application.ymlbuilds-pathKamil Trzcinski2015-07-081-6/+2
| |
* | Merge branch 'secure-oauth-state' into 'master'Kamil Trzciński2015-07-095-5/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added random salt and hashing to oauth state parameter This ensures signs state parameter. The generated state is built like this: ``` salt = random_hex(16bytes) secret = sha256_hex(gitlab_ci_secret + salt + return_to) state = "salt:secret:return_to" ``` This prevents from faking the state and forcing redirect to provided URL. However this doesn't prevent replay attacks if you know the valid `state` parameter for specific `return_to`. Should we be concerned about it? /cc @vsizov @jacobvosmaer See merge request !192
View Lorry Controller Status