summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-162-0/+61
|\ | | | | | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| * Improve authentication service specsKamil Trzcinski2016-05-151-8/+20
| |
| * Rename JWT to JSONWebTokenKamil Trzcinski2016-05-142-2/+2
| |
| * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1310-47/+195
| |\ | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | Fix CI testsKamil Trzcinski2016-05-122-2/+2
| | |
| * | Added rspec for testing container registry authentication serviceKamil Trzcinski2016-05-092-0/+49
| | |
* | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-162-30/+87
|\ \ \
| * | | Fix validation method for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-132-2/+16
| | | |
| * | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-132-88/+57
| | | |
| * | | Import PRs where branch names were reused across PRsDouglas Barbosa Alexandre2016-05-131-6/+26
| | | |
| * | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-131-0/+6
| | | |
| * | | Fix spec for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-131-22/+70
| | |/ | |/|
* | | Add cache count metrics to rails cacheadd-cache-count-metricsPablo Carranza2016-05-151-5/+11
|/ /
* | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-133-6/+6
| |
* | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-33/+78
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| * \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-103-1/+25
| |\ \
| * | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-33/+78
| | |/ | |/| | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* | | Removed tracking of total method execution timestotal-method-timeYorick Peterse2016-05-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because method call timings are inclusive (that is, they include the time of any sub method calls) this would lead to the total method execution time often being far greater than the total transaction time. Because this is incredibly confusing it's best to simply _not_ track the total method execution time, after all it's not that useful to begin with. Fixes gitlab-org/gitlab-ce#17239
* | | Implement @rymai's feedback after review.Timothy Andrew2016-05-121-2/+10
| | | | | | | | | | | | | | | - Separate 'exercise' and 'verify' steps of tests. - Use `build_stubbed` instead of `build`
* | | Add a spec for `WikiLinkFilter`Timothy Andrew2016-05-121-0/+77
| | | | | | | | | | | | - And fix behavior for non-file hierarchical links.
* | | Only generate repository push email onceSean McGivern2016-05-111-1/+1
| |/ |/| | | | | | | | | | | | | | | The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.)
* | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' Robert Speicher2016-05-101-0/+18
|\ \ | | | | | | | | | | | | | | | | | | Fix using link to uploads in global snippets Closes #17342, closes #17363 See merge request !4085
| * | Do not process upload links if no project contextGrzegorz Bizon2016-05-101-3/+3
| | |
| * | Fix using link to uploads in global snippetsGrzegorz Bizon2016-05-101-0/+18
| | | | | | | | | | | | Closes #17342, closes #17363
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-101-1/+1
|\ \ \
| * | | Revert "Merge branch 'wiki-fix' into 'master' "Rémy Coutable2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cc85a58e8ca00f5a4ecbd2bca40a0cad867b817, reversing changes made to 90ae445ba930068d04adc5a009dbdeabe4cb3e34. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Use a case-insensitive comparison in sanitizing URI schemesStan Hu2016-05-091-0/+6
|/ / / | | | | | | | | | Closes #1625
* | | Merge branch 'issue_15394' into 'master' Rémy Coutable2016-05-091-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Sanitize milestones and labels titles fixes #15394 See merge request !4046
| * | Sanitize milestones and label titlesissue_15394Felipe Artur2016-05-051-1/+1
| | |
* | | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-091-1/+1
| |/ |/|
* | Merge branch 'fix/import-url-issues' into 'master' Robert Speicher2016-05-051-6/+20
|\ \ | | | | | | | | | | | | | | | | | | Fix importer bug when throwing exceptions Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15681 See merge request !3941
| * | fix failing specfix/import-url-issuesJames Lopez2016-04-281-5/+4
| | |
| * | added spec testing exception raisedJames Lopez2016-04-281-6/+21
| | |
* | | Fix the line code when importing PR review comments from GitHubDouglas Barbosa Alexandre2016-05-051-17/+13
| |/ |/| | | | | | | Pull Request Review Comments are comments on a portion of the unified diff.
* | 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
| | | | |