summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| |\ \ \
| * | | | More refactoring from last code review. #3945Rubén Dávila2016-01-142-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
| * | | | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-143-34/+181
| | | | |
| * | | | Refactor highlighting linesDouwe Maan2016-01-141-25/+4
| | | | |
| * | | | Remove duplication around highlighting.Douwe Maan2016-01-142-12/+24
| | | | |
| * | | | Use #sub instead of #gsub!. #3945Rubén Dávila2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is because is not a good idea to modify the original lines * Also I run into this issue https://gitlab.com/gitlab-org/gitlab_git/issues/14 which is returning Diff Lines with the same @new_pos value.
| * | | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-2/+2
| | | | |
| * | | | Fix broken specs. #3945Rubén Dávila2016-01-121-1/+1
| | | | |
| * | | | Remove no longer required code. #3945Rubén Dávila2016-01-121-42/+9
| | | | |
| * | | | Small fixes from code review. #3945Rubén Dávila2016-01-121-4/+0
| | | | |
| * | | | Fix broken spec for submodule commit. #3945Rubén Dávila2016-01-091-2/+10
| | | | |
| * | | | Fix broken specs. #3945Rubén Dávila2016-01-081-5/+5
| | | | |
| * | | | Remove custom Lexer. #3945 [ci skip]Rubén Dávila2016-01-082-28/+1
| | | | | | | | | | | | | | | | | | | | Inline diff is going to be generated client side now. #3945
| * | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-072-20/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
| * | | | Don't process inline diffs on backend. #3945Rubén Dávila2016-01-072-108/+1
| | | | |
| * | | | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-311-12/+43
| | | | |
| * | | | Don't modify "match" diff lines. #3945Rubén Dávila2015-12-301-1/+6
| | | | |
| * | | | A bit of refactoring. #3945Rubén Dávila2015-12-303-9/+11
| | | | |
| * | | | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-302-3/+3
| | | | |
| * | | | Fix Rubocop complain. #3945Rubén Dávila2015-12-301-5/+5
| | | | |
| * | | | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-304-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
| * | | | Set initial state on parent Lexer. #3945Rubén Dávila2015-12-281-0/+4
| | | | |
| * | | | Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-281-0/+20
| | | | |
* | | | | WIP lazy blobsJacob Vosmaer2016-02-011-2/+4
| |_|/ / |/| | |
* | | | 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.
* | | 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
View Lorry Controller Status