summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Resolve mergeafter-scriptKamil Trzcinski2016-04-181-15/+0
|
* Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-181-3/+37
|\
| * Minor refactorings in CI configfeature/ci-job-env-variablesGrzegorz Bizon2016-04-181-4/+7
| |
| * Validate job-level variables in YAML config fileGrzegorz Bizon2016-04-181-0/+8
| |
| * Minor refactoring in code related to job variablesGrzegorz Bizon2016-04-181-5/+1
| |
| * Make CI config return empty array if no job variablesGrzegorz Bizon2016-04-181-2/+5
| |
| * Rename method that returns global envs in CI confGrzegorz Bizon2016-04-181-1/+1
| |
| * Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-181-2/+10
| |
| * Add `variables` keyword to job in CI config YAMLGrzegorz Bizon2016-04-181-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-181-10/+27
|\ \ | |/
| * Use Module#prepend for method instrumentationfix-method-instrumentationYorick Peterse2016-04-181-10/+27
| | | | | | | | | | | | | | | | | | By using Module#prepend we can define a Module containing all proxy methods. This removes the need for setting up crazy method alias chains and in turn prevents us from having to deal with all that madness (e.g. methods calling each other recursively). Fixes gitlab-org/gitlab-ce#15281
* | Fix rubocop complainsKamil Trzcinski2016-04-181-27/+33
| |
* | Rename finally_script to after_scriptKamil Trzcinski2016-04-171-6/+6
| |
* | Implement finally_script which allows to do cleanups as part of the build ↵Kamil Trzcinski2016-04-161-2/+8
|/ | | | process
* Merge branch 'fix/project-import_url' into 'master' Robert Speicher2016-04-1512-47/+91
|\ | | | | | | | | | | | | | | | | 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
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-154-33/+22
| |\ | | | | | | | | | fix/project-import_url
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-1428-136/+516
| |\ \ | | | | | | | | | | | | fix/project-import_url
| * | | updated migration based on testing findingsJames Lopez2016-04-141-1/+1
| | | |
| * | | refactored create_or_update_import_dataJames Lopez2016-04-073-3/+3
| | | |
| * | | refactored a few things based on MR feedbackJames Lopez2016-04-074-18/+8
| | | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0714-20/+215
| |\ \ \ | | | | | | | | | | | | | | | fix/project-import_url
| * | | | fix some issues with credentialsJames Lopez2016-04-062-7/+7
| | | | |
| * | | | some refactoring to symbolise keys across importers and left a TODOJames Lopez2016-04-055-13/+13
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-052-0/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | fix/project-import_url
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0444-259/+455
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb
| * | | | | | corrected a couple of based on MR reviewJames Lopez2016-04-041-2/+1
| | | | | | |
| * | | | | | remove useless varJames Lopez2016-04-011-1/+0
| | | | | | |
| * | | | | | fixes after more import testingJames Lopez2016-04-012-2/+2
| | | | | | |
| * | | | | | fix github import issuesJames Lopez2016-04-011-1/+1
| | | | | | |
| * | | | | | fix fogbugz importJames Lopez2016-04-012-9/+8
| | | | | | |
| * | | | | | 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-291-1/+5
| | | | | | |
| * | | | | | refactored code based on feedback plus fixed a couple of other issuesJames Lopez2016-03-286-41/+36
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-285-25/+100
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| * | | | | | | added rest of importers, fixed specs and some issues with the migrationJames Lopez2016-03-232-9/+13
| | | | | | | |
| * | | | | | | fogbugz importer, also refactored migration again to make it easier to add ↵James Lopez2016-03-232-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new importers
| * | | | | | | 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-224-31/+32
| | | | | | | |
| * | | | | | | encrypt credentials in project_creator for bitbucket by defaultJames Lopez2016-03-221-1/+1
| | | | | | | |
| * | | | | | | update bitbucket importerJames Lopez2016-03-222-6/+13
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-226-11/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-213-1/+97
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb
| * | | | | | | | | refactored code based on feedbackJames Lopez2016-03-211-3/+3
| | | | | | | | | |
| * | | | | | | | | fixed some rubocop warningsJames Lopez2016-03-211-1/+1
| | | | | | | | | |
| * | | | | | | | | fixed few issues with the migrationJames Lopez2016-03-211-0/+1
| | | | | | | | | |
| * | | | | | | | | more refactoringJames Lopez2016-03-214-19/+25
| | | | | | | | | |
| * | | | | | | | | some refactoring based on feedbackJames Lopez2016-03-214-16/+28
| | | | | | | | | |
| * | | | | | | | | Merge branches 'fix/project-import_url' and 'master' of ↵James Lopez2016-03-2142-215/+671
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url # Conflicts: # db/schema.rb
View Lorry Controller Status