summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-1912-48/+231
|\ | | | | | | | | # Conflicts: # db/schema.rb
| * Merge branch 'api-fix-annotated-tags' into 'master' Rémy Coutable2016-04-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | API: Present an array of Gitlab::Git::Tag instead of array of rugged tags The annotated message was always `null` because the wrong array was presented. The entity requires an array of `Gitlab::Git::Tags` instead an array of raw rugged tags was presented. Since a rugged tag does not respond to `message` to get the annotated message, this was always `null`. See merge request !3764
| | * API: Present an array of Gitlab::Git::Tag instead of array of rugged tagsRobert Schilling2016-04-171-1/+1
| | |
| * | Merge branch 'make-before-after-overridable' into 'master' Kamil Trzciński2016-04-191-15/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make before_script and after_script overridable This is makes it possible to overwrite the before_script and after_script at job level. This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3771 See merge request !3772
| | * | Make rubocop happymake-before-after-overridableKamil Trzcinski2016-04-181-12/+15
| | | |
| | * | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-15/+0
| | |\ \
| | * \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-182-13/+64
| | |\ \ \
| | * \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-27/+33
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-171-9/+9
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | Allow the before_script and finally_script to be overwritten in context of jobKamil Trzcinski2016-04-161-11/+11
| | | | | | | |
| * | | | | | | Merge branch 'after-script' into 'master' Kamil Trzciński2016-04-191-18/+30
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement after_script which allows to do cleanups as part of the build process This implements `after_script` in global context. The `after_script` will be executed always after the job, even if the job were canceled. This requires changes on Runner side that will be implemented in 1.2. cc @tmaczukin @grzesiek See merge request !3771
| | * | | | | | Resolve mergeafter-scriptKamil Trzcinski2016-04-181-15/+0
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-181-3/+37
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-181-10/+27
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | 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
| * | | | Using single builder for push and tag eventsGabriel Mazetto2016-04-191-20/+1
| | | | |
| * | | | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-191-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Code is based on Project Webhooks, removing deprecations and without commits listing.
| * | | | Set GitHub milestones to Issue/Merge Request that were importedDouglas Barbosa Alexandre2016-04-182-0/+14
| | | | |
| * | | | Import milestones from GitHubDouglas Barbosa Alexandre2016-04-182-1/+60
| | | | |
| * | | | Apply GitHub labels to Issue/Merge Request that were importedDouglas Barbosa Alexandre2016-04-181-0/+14
| | | | |
| * | | | Import labels from GitHubDouglas Barbosa Alexandre2016-04-182-1/+34
| | | | |
| * | | | Merge branch 'gh-keep-issues-prs-references' into 'master' Robert Speicher2016-04-182-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GitHub Issue/PR number as iid to keep references Closes #15294 See merge request !3759
| | * | | | Use GitHub Issue/PR number as iid to keep referencesDouglas Barbosa Alexandre2016-04-182-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these changes we don’t lost the issue/pr references when importing them to GitLab.
| * | | | | Add "action" tag to /internal/allowed APIYorick Peterse2016-04-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to re-use any other analytics that rely on the "action" tag having a value set.
| * | | | | Merge branch 'issue_3508' into 'master' Douwe Maan2016-04-181-2/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict public users for private instances Implements #3508 See merge request !3440
| | * | | | Add changelog entryFelipe Artur2016-04-181-1/+1
| | | | | |
| | * | | | Fix documentation and improve permissions codeFelipe Artur2016-04-182-5/+1
| | | | | |
| | * | | | Insert users check into apiFelipe Artur2016-04-182-2/+12
| | | |_|/ | | |/| |
| * | | | Count the number of SQL queries per transactionYorick Peterse2016-04-181-0/+1
| |/ / / | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15335
| * | | 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
| | |/ | |/|
| * | 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
* | Write specs for this featureKamil Trzcinski2016-04-161-6/+13
| |
* | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1628-176/+295
|\ \ | |/ | | | | | | # Conflicts: # db/schema.rb
| * 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
| | | | | |
View Lorry Controller Status