summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validationRobert Speicher2016-01-161-1/+1
| | | | | Previously it was "user has already been taken", when really we were saying the user has already been reported.
* Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-153-4/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the CI runner know about builds that this build depends on This allows us to implement artifacts passing: runner will download artifacts from all prior builds. It will happen automatically, and always, as long as artifacts are enabled. ## The changes: This MR exposes list of prior builds in CI::API::Builds. **The API response when asking for builds** ```json { "id": 48584, "ref": "0.1.1", "tag": true, "sha": "d63117656af6ff57d99e50cc270f854691f335ad", "status": "success", "name": "pages", "token": "9dd60b4f1a439d1765357446c1084c", "stage": "test", "project_id": 479, "project_name": "test", "commands": "echo commands", "repo_url": "http://gitlab-ci-token:token@gitlab.example/group/test.git", "before_sha": "0000000000000000000000000000000000000000", "allow_git_fetch": false, "options": { "image": "docker:image", "artifacts": { "paths": [ "public" ] }, "cache": { "paths": [ "vendor" ] } }, "timeout": 3600, "variables": [ { "key": "CI_BUILD_TAG", "value": "0.1.1", "public": true } ], "dependencies": { "builds": [ { "id": 48584, "ref": "0.1.1", "tag": true, "sha": "d63117656af6ff57d99e50cc270f854691f335ad", "status": "success", "name": "build", "token": "9dd60b4f1a439d1765357446c1084c", "stage": "build", "project_id": 479, "project_name": "test", "artifacts_file": { "filename": "artifacts.zip", "size": 0 } } ] } } ``` ## How it will work? **Example:** ``` build: type: build script: - echo TEST > test_file artifacts: untracked: true rspec: type: test script: - test-my-project staging: type: deploy script: - scp test_file root@server.com: ``` **The flow:** 1. We run `build`. The `build` creates a file `test_file`. This file gets archived and send us build artifacts. 2. We run `rspec`. The `rspec` downloads build artifacts from `build`. Uses the `test_file`. 3. We run `staging`. The `staging` downloads build artifacts from `build` and `rspec`, but since the `rspec` doesn't have build artifacts we skip that build. Deploys the `test_file`. This partially implements the https://gitlab.com/gitlab-org/gitlab-ce/issues/3423. In the next release we will introduce option to configure what artifacts are received. /cc @grzesiek @DouweM @sytse @rspeicher See merge request !2437
| * Change dependencies.builds to depends_on_buildsKamil Trzcinski2016-01-151-2/+2
| |
| * Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-143-4/+40
| | | | | | | | This allows us to implement artifacts passing: runner will download artifacts from all prior builds
* | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1423-39/+849
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (150 commits) fixes margin and padding Update mailroom/postfix documentation [ci skip] Fix css mess around git clone panel. Align it properly Fix missing padding for user/group pages Fix parse_gollum_tags matcher Update documentation on Banzai::Filter::GollumTagsFilter Add tests for the wiki pipeline Refactoring Banzai::Filter::GollumTagsFilter Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter Remove GollumTagsPipeline Refactoring Gitlab::GithubImport::Importer Remove unnecessary brackets on WIKI_SLUG_ID route constraints Move js function to removing accents to vendor/assets/javascripts Update CHANGELOG Use the WikiPipeline when rendering the wiki markdown content Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML Relax constraints for wiki slug Import GitHub wiki into GitLab Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus Revert changes to how the notes are paginated in the API ... Conflicts: doc/api/README.md lib/api/entities.rb
| * Merge branch 'ci/api-builds' into 'master' Douwe Maan2016-01-142-0/+183
| |\ | | | | | | | | | | | | | | | | | | Add builds API References #4264 See merge request !2207
| | * Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1414-75/+581
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) Fix version Fix specs and rubocop warnings Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages fixed LDAP activation on login to use new ldap_blocked state Fix Admin/Users view to position buttons without spacing magic Update to Go 1.5.3 Fix the undefinded variable error in Project's safe_import_url method Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Fix misaligned edit button in milestone collection partial Update button styles for Milestones#show Modify builds API documentation style [ci skip] Modify :ci_variable factory Ensure the API doesn't return notes that the current user shouldn't see Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add spec for Note#cross_reference_not_visible_for? Remove (invalid) timestamp formatting Move `BroadcastMessage#status` to a helper since it's presentational Update CHANGELOG ... Conflicts: doc/api/README.md lib/api/api.rb lib/api/entities.rb
| | * | Remove hard-coded id from builds factoryTomasz Maczukin2016-01-141-2/+1
| | | |
| | * | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1312-57/+120
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR reverting _mr_title.html.haml ...
| | * | | Add seperated 'describe' block for build trace specsTomasz Maczukin2016-01-131-7/+13
| | | | |
| | * | | Change :ci_build_canceled factory to :canceled traitTomasz Maczukin2016-01-132-5/+5
| | | | |
| | * | | Add some fixes after reviewTomasz Maczukin2016-01-131-0/+6
| | | | |
| | * | | Fix :ci_build_with_trace factoryTomasz Maczukin2016-01-111-1/+3
| | | | |
| | * | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1146-252/+1029
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (143 commits) Only load autocomplete data when actually needed Check for current user Add pencil icon to edit group settings Issue #5817 wording of the web hooks updated on issue and merge events use JavaScript instead of CoffeeScript in Views, the reason #9819 Before project save ensure that a runners_token exists Fix Error 500 when visiting build page of project with nil runners_token Remove outdated gitlab-git-http-server reference from Install doc Fix typo in build page of projects Update docs for shared runner default settings Disable "Already Blocked" button in admin abuse report page Add CHANGELOG entry for reply-by-email fix Use WOFF versions of SourceSansPro Clean up document on adding users to a project Refactor ZenMode Fix caching issue where build status was not updating in project dashboard Add a CHANGELOG entry for The Most Important Feature of All Time(TM) changes verb `references` to noun `reference`. fixes new branch button positioning, when visible and not visible container DRY up upload and download services ...
| | * | | | Change commit builds URL in builds APITomasz Maczukin2016-01-111-3/+3
| | | | | |
| | * | | | Add some modifications to builds API and specsTomasz Maczukin2016-01-081-4/+4
| | | | | |
| | * | | | Change test access level from MASTER to DEVELOPERTomasz Maczukin2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This should help us detect potential regressions in the future.
| | * | | | Modify entities for builds APITomasz Maczukin2016-01-081-1/+0
| | | | | |
| | * | | | Modify builds scope filtering in builds APITomasz Maczukin2016-01-081-1/+14
| | | | | |
| | * | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-0524-390/+326
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (75 commits) Fix grammar Clarify the key generation step Remove misleading `ssh-dsa` markdown fixes markdown fixes Add `AbuseReport#notify` Make AbuseReportMailer responsible for knowing if it should deliver Redirect back to user profile page after abuse report Redesign the AbuseReports index Don't notify users twice if they are both project watchers and subscribers Restructure logo JS to use `setInterval` Decrease the logo sweep delay Correct the logo ID names Update CHANGELOG Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification Remove jquery.blockUI.js plugin rempves tests for "you have master access" text Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' " removes footer message about access to project remove public field from namespace and refactoring ...
| | * \ \ \ \ Merge branch 'master' into ci/api-buildsTomasz Maczukin2015-12-3025-10/+1204
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (108 commits) Fix project transfer e-mail sending incorrect paths in e-mail notification Update CHANGELOG Use Gitlab::CurrentSettings for InfluxDB Write to InfluxDB directly via UDP Strip newlines from obfuscated SQL Add hotfix that allows to access build artifacts created before 8.3 note votes methids implementation When reCAPTCHA is disabled, allow registrations to go through without a code Downcased user or email search for avatar_icon. Handle missing settings table for metrics Fix broken link in permissions page [ci skip] reCAPTCHA is configurable through Admin Settings, no reload needed. Fixed syntax in gitlab.yml.example Move InfluxDB settings to ApplicationSetting Fix spelling mistake, thanks Connor. Restart settings are moved too. Hotfix for builds trace data integrity add issue weight to contributing Added host option for InfluxDB Fixed styling of MetricsWorker specs ...
| | * | | | | | Add cancel/retry features to builds APITomasz Maczukin2015-12-302-1/+65
| | | | | | | |
| | * | | | | | Add specs for build details/traces features in builds APITomasz Maczukin2015-12-302-2/+44
| | | | | | | |
| | * | | | | | Add specs for build listings in APITomasz Maczukin2015-12-291-0/+52
| | | | | | | |
| * | | | | | | Merge branch 'add-pagination-headers-to-api' into 'master' Dmitriy Zaporozhets2016-01-143-1/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pagination headers to already paginated API resources Following #3045, I've added pagination headers using already available Kaminari methods. ## Pagination headers in action ![Screen_Shot_2016-01-14_at_12.14.53](/uploads/88807f754dd9aafbb24da85f6bdf9521/Screen_Shot_2016-01-14_at_12.14.53.png) --- I've also added a shared example to test paginated API resources. A possible next step would be to paginate all the API resources that return an array. See merge request !2426
| | * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-1416-81/+738
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-pagination-headers-to-api
| | * | | | | | | | Add pagination headers to already paginated API resourcesadd-pagination-headers-to-apiRémy Coutable2016-01-143-1/+29
| | | | | | | | | |
| * | | | | | | | | Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-148-7/+210
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| | * | | | | | | | | Fix parse_gollum_tags matcherDouglas Barbosa Alexandre2016-01-141-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Add tests for the wiki pipelineDouglas Barbosa Alexandre2016-01-144-5/+89
| | | | | | | | | | |
| | * | | | | | | | | Refactoring Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-141-4/+0
| | | | | | | | | | |
| | * | | | | | | | | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatterDouglas Barbosa Alexandre2016-01-141-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-141-2/+3
| | | | | | | | | | |
| | * | | | | | | | | Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTMLDouglas Barbosa Alexandre2016-01-142-0/+100
| | | | | | | | | | |
| | * | | | | | | | | Import GitHub wiki into GitLabDouglas Barbosa Alexandre2016-01-141-0/+22
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-143-1/+66
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| | * | | | | | | | Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-16/+16
| | | | | | | | | |
| | * | | | | | | | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-093-1/+66
| | | | | | | | | |
| * | | | | | | | | Merge branch 'ci/view-build-artifacts' into 'master' Grzegorz Bizon2016-01-147-30/+361
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add browser for build artifacts Discussion in #3426, closes #3426. See merge request !2123
| | * | | | | | | | Use Hash to store paths and entries metadata in artifacts browserGrzegorz Bizon2016-01-142-38/+36
| | | | | | | | | |
| | * | | | | | | | Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-141-8/+8
| | | | | | | | | |
| | * | | | | | | | Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-142-38/+60
| | | | | | | | | |
| | * | | | | | | | Refactor build artifacts upload API endpointGrzegorz Bizon2016-01-141-6/+5
| | | | | | | | | |
| | * | | | | | | | Update build artifacts APIGrzegorz Bizon2016-01-141-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not want to allow runners to upload a metadata file. This needs to be generated by Workhorse only.
| | * | | | | | | | Modify artifacts upload API endpoint, add artifacts metadataGrzegorz Bizon2016-01-141-0/+25
| | | | | | | | | |
| | * | | | | | | | Fix specs for artifacts metadata after changing fixture contentGrzegorz Bizon2016-01-141-2/+3
| | | | | | | | | |
| | * | | | | | | | Support only valid UTF-8 paths in build artifacts browserGrzegorz Bizon2016-01-142-0/+0
| | | | | | | | | |
| | * | | | | | | | Update build model specsGrzegorz Bizon2016-01-141-5/+4
| | | | | | | | | |
| | * | | | | | | | Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-142-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this version we will support only relative paths in artifacts metadata. Support for absolute paths will be introduced later.
| | * | | | | | | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-142-58/+10
| | | | | | | | | |
View Lorry Controller Status