summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'use-remote-ip-for-akismet' into 'master' Rémy Coutable2016-04-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Use ActionDispatch Remote IP for Akismet checking Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629 See merge request !3961
| * Use ActionDispatch Remote IP for Akismet checkingStan Hu2016-04-271-1/+1
| | | | | | | | | | | | | | | | Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629
* | Backport GitHub Enterprise import support from EEStan Hu2016-04-261-3/+37
|/ | | | | | | | | | These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
* Fix some typosTomasz Maczukin2016-04-221-6/+6
|
* Fix formattingTomasz Maczukin2016-04-221-3/+3
|
* Add posibility to define a hidden job without 'script' in .gitlab-ci.ymlTomasz Maczukin2016-04-221-49/+110
|
* Merge branch 'dev_issue_15331' into 'master' Robert Speicher2016-04-211-1/+9
|\ | | | | | | | | | | | | | | | | Fixes window.opener bug Adds `noreferrer` value to rel attribute for external links REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331 See merge request !1953
| * Fix failing specAlfredo Sumaran2016-04-211-1/+9
| |
* | Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon2016-04-211-16/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project label ref used with invalid project When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception. Closes #15168 See merge request !3811
| * | Fix cross-project label ref with invalid projectGrzegorz Bizon2016-04-211-16/+26
| |/ | | | | | | Closes #15168
* | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-212-97/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-198-64/+394
| |\ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | Rename CiStatus to StatusableKamil Trzcinski2016-04-161-103/+0
| | |
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-167-65/+128
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-133-9/+70
| |\ \ \
| * | | | Fix CiStatus implementation and testsKamil Trzcinski2016-04-131-1/+1
| | | | |
| * | | | Fix rest of rspec and spinach testsKamil Trzcinski2016-04-121-3/+12
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-112-11/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | | | Fix specsKamil Trzcinski2016-04-111-3/+3
| | | | | |
* | | | | | Fix setting of "action" for Grape transactionsYorick Peterse2016-04-201-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merely setting the "action" tag will only result in the transaction itself containing a value for this tag. To ensure other metrics also contain this tag we must set the action using Transaction#action= instead.
* | | | | | Fix wiki testsSebastian Klier2016-04-201-0/+9
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'make-before-after-overridable' into 'master' Kamil Trzciński2016-04-191-3/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-8/+8
| | | | | |
| * | | | | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-182-30/+109
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-171-14/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-3/+70
| | | | | | | | |
* | | | | | | | | Merge branch 'after-script' into 'master' Kamil Trzciński2016-04-191-0/+29
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-181-16/+72
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-181-14/+37
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Fix rubocop complainsKamil Trzcinski2016-04-181-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Rename finally_script to after_scriptKamil Trzcinski2016-04-171-7/+7
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Implement finally_script which allows to do cleanups as part of the build ↵Kamil Trzcinski2016-04-161-0/+29
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | process
* | | | | | | Using single builder for push and tag eventsGabriel Mazetto2016-04-191-22/+6
| | | | | | |
* | | | | | | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-191-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code is based on Project Webhooks, removing deprecations and without commits listing.
* | | | | | | Use double instead of OpenStruct in the Issue/PR formatters specsDouglas Barbosa Alexandre2016-04-182-32/+34
| | | | | | |
* | | | | | | Set GitHub milestones to Issue/Merge Request that were importedDouglas Barbosa Alexandre2016-04-182-0/+35
| | | | | | |
* | | | | | | Import milestones from GitHubDouglas Barbosa Alexandre2016-04-181-0/+82
| | | | | | |
* | | | | | | Import labels from GitHubDouglas Barbosa Alexandre2016-04-181-0/+19
| | | | | | |
* | | | | | | Use GitHub Issue/PR number as iid to keep referencesDouglas Barbosa Alexandre2016-04-182-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these changes we don’t lost the issue/pr references when importing them to GitLab.
* | | | | | | Count the number of SQL queries per transactionYorick Peterse2016-04-181-0/+3
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15335
* | | | | | Minor refactorings in CI configfeature/ci-job-env-variablesGrzegorz Bizon2016-04-181-3/+3
| | | | | |
* | | | | | Validate job-level variables in YAML config fileGrzegorz Bizon2016-04-181-13/+32
| | | | | |
* | | | | | Minor refactoring in code related to job variablesGrzegorz Bizon2016-04-181-19/+24
| | | | | |
* | | | | | Make CI config return empty array if no job variablesGrzegorz Bizon2016-04-181-0/+12
| | | | | |
* | | | | | 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/+2
| | | | | |
* | | | | | Make it possible to override build variablesGrzegorz Bizon2016-04-181-1/+1
| | | | | |
* | | | | | Add `variables` keyword to job in CI config YAMLGrzegorz Bizon2016-04-181-12/+32
| |/ / / / |/| | | |
* | | | | Use Module#prepend for method instrumentationfix-method-instrumentationYorick Peterse2016-04-181-14/+37
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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