summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add CHANGELOGpass-before-script-to-runnerKamil Trzcinski2016-04-171-0/+1
|
* Merge branch 'make-before-after-overridable' into pass-before-script-to-runnerKamil Trzcinski2016-04-174-23/+55
|\ | | | | | | | | | | | | | | | | | | * make-before-after-overridable: Update CHANGELOG and add documentation Add CHANGELOG and documentation Rename finally_script to after_script Conflicts: lib/ci/gitlab_ci_yaml_processor.rb
| * Update CHANGELOG and add documentationKamil Trzcinski2016-04-172-0/+21
| |
| * Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-174-23/+34
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * after-script: Add CHANGELOG and documentation Rename finally_script to after_script Conflicts: lib/ci/gitlab_ci_yaml_processor.rb spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
| | * Add CHANGELOG and documentationKamil Trzcinski2016-04-172-0/+11
| | |
| | * Rename finally_script to after_scriptKamil Trzcinski2016-04-172-13/+13
| | |
* | | Pass before_script and script to runner directly as this is a parameter of a ↵Kamil Trzcinski2016-04-164-25/+45
|/ / | | | | | | | | | | job. We provide a backward compatibility API for commands
* | Allow the before_script and finally_script to be overwritten in context of jobKamil Trzcinski2016-04-162-14/+81
|/
* Implement finally_script which allows to do cleanups as part of the build ↵Kamil Trzcinski2016-04-162-2/+37
| | | | process
* Merge branch 'rs-branch-name-space' into 'master' Jacob Schatz2016-04-151-2/+1
|\ | | | | | | | | | | | | Remove extra spacing from merge request target branch name See merge request !3758
| * Remove extra spacing from merge request target branch namers-branch-name-spaceRobert Speicher2016-04-151-2/+1
| |
* | Merge branch 'fix/project-import_url' into 'master' Robert Speicher2016-04-1522-56/+307
|\ \ | |/ |/| | | | | | | | | | | | | Fix for import_url fields on projects containing third-party credentials Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13955 See merge request !3066
| * resolve merge conflictfix/project-import_urlJames Lopez2016-04-151-5/+1
| |
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-1553-98/+558
| |\ | | | | | | | | | fix/project-import_url
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-14344-1762/+8174
| |\ \ | | | | | | | | | | | | fix/project-import_url
| * | | update changelog [ci skip]James Lopez2016-04-141-0/+1
| | | |
| * | | updated migration based on testing findingsJames Lopez2016-04-142-7/+14
| | | |
| * | | typoJames Lopez2016-04-111-1/+1
| | | |
| * | | changed a few things based on feedbackJames Lopez2016-04-114-22/+17
| | | |
| * | | fix create_or_update_import_dataJames Lopez2016-04-071-1/+4
| | | |
| * | | fix schema file [ci skip]James Lopez2016-04-071-2/+3
| | | |
| * | | refactored create_or_update_import_dataJames Lopez2016-04-074-19/+10
| | | |
| * | | refactored a few things based on MR feedbackJames Lopez2016-04-076-22/+25
| | | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-07109-627/+1794
| |\ \ \ | | | | | | | | | | | | | | | fix/project-import_url
| * | | | removed TODO [ci skip]James Lopez2016-04-061-1/+0
| | | | |
| * | | | fix some issues with credentialsJames Lopez2016-04-063-9/+9
| | | | |
| * | | | some refactoring to symbolise keys across importers and left a TODOJames Lopez2016-04-058-20/+23
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0522-52/+138
| |\ \ \ \ | | | | | | | | | | | | | | | | | | fix/project-import_url
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-04258-1636/+13143
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb
| * | | | | | fix migration issueJames Lopez2016-04-041-0/+1
| | | | | | |
| * | | | | | fix wordingJames Lopez2016-04-041-5/+5
| | | | | | |
| * | | | | | fixes based on MR reviewJames Lopez2016-04-041-14/+13
| | | | | | |
| * | | | | | corrected a couple of based on MR reviewJames Lopez2016-04-042-4/+3
| | | | | | |
| * | | | | | remove useless varJames Lopez2016-04-011-1/+0
| | | | | | |
| * | | | | | fixes after more import testingJames Lopez2016-04-012-2/+2
| | | | | | |
| * | | | | | fix github import issuesJames Lopez2016-04-012-2/+2
| | | | | | |
| * | | | | | fix fogbugz importJames Lopez2016-04-013-9/+12
| | | | | | |
| * | | | | | more fixes after doing more manual testing on importingJames Lopez2016-03-292-2/+4
| | | | | | |
| * | | | | | fixing a few issues after testing importsJames Lopez2016-03-293-13/+10
| | | | | | |
| * | | | | | fixed failing specsJames Lopez2016-03-292-1/+6
| | | | | | |
| * | | | | | refactored code based on feedback plus fixed a couple of other issuesJames Lopez2016-03-288-64/+81
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-28140-1140/+5337
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| * | | | | | | added rest of importers, fixed specs and some issues with the migrationJames Lopez2016-03-235-15/+23
| | | | | | | |
| * | | | | | | fogbugz importer, also refactored migration again to make it easier to add ↵James Lopez2016-03-233-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new importers
| * | | | | | | refactored migration a bit and fixed a few problems. Also added some loggingJames Lopez2016-03-231-13/+23
| | | | | | | |
| * | | | | | | fix rubocop warningJames Lopez2016-03-221-2/+0
| | | | | | | |
| * | | | | | | fix gitlab import and specJames Lopez2016-03-222-5/+7
| | | | | | | |
| * | | | | | | first round of fixes and spec fixesJames Lopez2016-03-226-37/+39
| | | | | | | |
| * | | | | | | encrypt credentials in project_creator for bitbucket by defaultJames Lopez2016-03-221-1/+1
| | | | | | | |
| * | | | | | | update bitbucket importerJames Lopez2016-03-223-7/+14
| | | | | | | |
View Lorry Controller Status