summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix commits ordering when using PostgreSQLfix-commits-ordering-for-postgresqlKamil Trzcinski2015-08-261-1/+1
|
* Order commits by committed_at and idKamil Trzcinski2015-08-241-1/+1
| | | | This needs to be done that way, because the committed_at can be null for some pretty old commits.
* Merge branch 'build-triggers' into 'master'Robert Speicher2015-08-2116-46/+289
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement build trigger API This commit implements Build Triggers. There are changes to API request: - Due to security advised method to pass trigger token is to use form data - Advised method to pass variables is to use form data TODO: - [x] Implement API - [x] Implement UI - [x] Dimitriy and Valery review - [x] Write specs - [x] Write documentation - [x] Job documentation review See merge request !229
| * Added TriggerController specsbuild-triggersKamil Trzcinski2015-08-211-1/+1
| |
| * Nice icon for triggersKamil Trzcinski2015-08-211-1/+1
| |
| * Retrigger builds with [ci skip]Kamil Trzcinski2015-08-211-3/+4
| |
| * Added CreateTriggerRequestService specsKamil Trzcinski2015-08-211-2/+2
| |
| * Initial support for build triggersKamil Trzcinski2015-08-2113-36/+273
| |
| * Add committed_at to commits to properly order last commit (the force push issue)Kamil Trzcinski2015-08-215-7/+12
| |
* | Merge branch 'nav-icons' into 'master'Robert Speicher2015-08-212-2/+2
|\ \ | | | | | | | | | | | | | | | Fix navigation icons See merge request !239
| * | Fix navigation iconsKamil Trzcinski2015-08-212-2/+2
| |/
* | Redirect to known route instead of :backKamil Trzcinski2015-08-211-1/+1
| |
* | Fix spellingKamil Trzcinski2015-08-211-1/+1
| |
* | Update variables from within it's own controller not the project'sKamil Trzcinski2015-08-212-2/+16
| |
* | Fix problem with variables savingKamil Trzcinski2015-08-211-1/+1
|/
* Merge branch 'variable-fix' into 'master'Robert Speicher2015-08-191-0/+3
|\ | | | | | | | | | | Require the variable key to be set and unique See merge request !234
| * Require the variable key to be set and uniquevariable-fixKamil Trzcinski2015-08-191-0/+3
| |
* | Add missing stage when doing retry on a buildKamil Trzcinski2015-08-191-0/+1
|/
* 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
| |
View Lorry Controller Status