summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
|
* Restore diff commentsDouwe Maan2016-01-221-4/+5
|
* Merge branch 'workhorse-path' into 'master' Robert Speicher2016-01-212-3/+9
|\ | | | | | | | | | | | | | | | | | | | | Init script changes for gitlab-workhorse in 8.4 Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31 Also bumps gitlab-workhorse to 0.6.1. [ci skip] See merge request !2529
| * Init script changes for gitlab-workhorse in 8.4Jacob Vosmaer2016-01-212-3/+9
| |
* | Fix import of GitHub's wiki when the repository has not been createdDouglas Barbosa Alexandre2016-01-211-2/+6
| |
* | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-211-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cache:key to .gitlab-ci.yml allowing to fine tune the caching The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need: 1. Cache per-build for all branches: ``` cache: key: "$CI_BUILD_NAME" untracked: true ``` 2. Cache per-branch for all jobs: ``` cache: key: "$CI_BUILD_REF" untracked: true ``` /cc @DouweM @grzesiek @axil See merge request !2436
| * | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-keyKamil Trzcinski2016-01-201-0/+8
| | |
* | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cross projects detection when importing GitHub pull requests Fixes #12456 See merge request !2523
| * | | Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-201-1/+5
| |/ /
* | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-202-0/+139
|\ \ \ | |/ /
| * | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-202-0/+139
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | * | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-202-0/+139
| | |/
* | | Merge branch 'master' into issue_3945Douwe Maan2016-01-201-0/+2
|\ \ \ | |/ /
| * | Gracefully handle invalid UTF-8 sequences in Markdown linksfix-error-500-with-invalid-utf8Stan Hu2016-01-201-0/+2
| |/ | | | | | | Closes #6077
* | Validate bounds just to be sureDouwe Maan2016-01-201-0/+3
| |
* | Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-203-7/+15
| |
* | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-203-9/+25
| |
* | Properly handle HTML entities with inline diffsDouwe Maan2016-01-203-15/+19
| |
* | Merge branch 'master' into issue_3945Douwe Maan2016-01-209-30/+56
|\ \ | |/
| * Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-191-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added X-GitLab-... headers to emails from CI and Email On Push services Fixes #2098 This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and 'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way that it is done currently for merge requests and issues emails. Additionally, CI emails will have 'X-GitLab-Build-Status' header with either 'fail' or 'success'. Emails from Email On Push will include 'X-Gitlab-Author' header containing the username of user who did the push. See merge request !2159
| | * Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-191-0/+1
| | | | | | | | | | | | Fixes #2098
| * | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-193-22/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow LDAP users to change their email if it was not set by the LDAP server Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054 See merge request !2502
| | * | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-193-22/+29
| | |/
| * | Change 'public' flag to more robust 'visibility' query.Josh Frye2016-01-191-2/+2
| | |
| * | Add public params to GET /projects api. Closes #3788Josh Frye2016-01-191-0/+4
| |/
| * Ensure that doesn't have pending migrations when running the specsDouglas Barbosa Alexandre2016-01-191-1/+0
| |
| * Prevent StateMachine warnings from outputting during a cron taskRobert Speicher2016-01-151-0/+3
| | | | | | | | | | | | [ci skip] Closes #5931
| * Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-152-6/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+2
| | |
| | * Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-142-6/+17
| | | | | | | | | | | | This allows us to implement artifacts passing: runner will download artifacts from all prior builds
| * | Fix signup for some OAuth providersSteffen Köhler2016-01-151-1/+4
| | | | | | | | | | | | | | | | | | some OAuth providers (kerberos for example) only provide a username and an email, but no name. Therefore a signup fails because the name is empty. Best guess for the name is probably the username, therefore use it as name.
* | | Move parallel diff logic to separate classDouwe Maan2016-01-202-0/+121
| | |
* | | Don't crash when file can't be highlightedDouwe Maan2016-01-191-9/+3
| | |
* | | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-191-6/+20
| | |
* | | Remove useless assignmentsDouwe Maan2016-01-191-2/+0
| | |
* | | Add testsDouwe Maan2016-01-152-0/+11
| | |
* | | Whoops, forgot to add filesDouwe Maan2016-01-152-0/+160
| | |
* | | Move inline diff marker logic to its own classDouwe Maan2016-01-151-95/+11
| | |
* | | Move inline diff logic to its own classDouwe Maan2016-01-151-73/+11
| | |
* | | Method was movedDouwe Maan2016-01-151-2/+2
| | |
* | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1493-368/+1497
|\ \ \ | |/ /
| * | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1455-94/+652
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 'diff-parse-first-commit' into 'master'Robert Speicher2016-01-141-2/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly generate diff of orphan commits, like the first commit in a repository Fixes gitlab-org/gitlab_git#14 See merge request !2427
| | | * \ Merge branch 'master' into diff-parse-first-commitdiff-parse-first-commitDouwe Maan2016-01-143-0/+100
| | | |\ \
| | | * | | Properly generate diff of orphan commits, like the first commit in a repositoryDouwe Maan2016-01-141-2/+3
| | | | | |
| | * | | | Merge branch 'backport-ee' into 'master' Robert Speicher2016-01-1442-69/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Backport two commits from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110 See merge request !2424
| | | * | | Prevent circular reference error in BanzaiDouwe Maan2016-01-1442-69/+0
| | | | | |
| | * | | | Merge branch 'ci/api-builds' into 'master' Douwe Maan2016-01-143-0/+177
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add builds API References #4264 See merge request !2207
| | | * | | | Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-buildsTomasz Maczukin2016-01-141-1/+1
| | | | | | |
| | | * | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-146-10/+131
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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