summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-171-9/+12
|\ | | | | | | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
| * Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-151-9/+12
| | | | | | | | Closes #13469
* | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-162-9/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
| * | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-112-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
* | | Fix undefined method `postgresql?` during migrationrs-gitlab-database-moduleRobert Speicher2016-02-151-0/+32
| |/ |/|
* | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-121-16/+0
|/ | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
* Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-041-0/+20
|\
| * Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-021-0/+20
| | | | | | | | Closes #12900
* | Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipelineRobert Speicher2016-02-032-22/+37
| | | | | | | | | | This allows for future pipelines to more easily define a custom whitelist.
* | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-021-0/+35
|/ | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-0/+8
|
* Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-313-26/+89
|\ | | | | | | | | Mark inline difference between old and new paths when a file is renamed See merge request !2652
| * Fix specs and add a new oneDouwe Maan2016-01-301-24/+24
| |
| * Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-293-27/+90
| |
* | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-291-2/+2
|/ | | | | | This is the git default and will help to prevent false positive matches. Closes #12706
* Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-68/+0
| | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
* Move blame group logic to dedicated classDouwe Maan2016-01-281-0/+24
|
* Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-261-0/+11
| | | | | | | | | | | | | The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used.
* Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-251-0/+10
| | | | | | | | | | | | This ensures that an instrumented method that doesn't take arguments reports an arity of 0, instead of -1. If Ruby had a proper method for finding out the required arguments of a method (e.g. Method#required_arguments) this would not have been an issue. Sadly the only two methods we have are Method#parameters and Method#arity, and both are equally painful to use. Fixes gitlab-org/gitlab-ce#12450
* Whitelist raw "abbr" elements when parsing MarkdownBenedict Etzel2016-01-231-0/+5
| | | | Closes #12517
* Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-212-7/+25
|\ | | | | | | | | Add method to calculate total size of artifacts in subpath See merge request !2500
| * Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-202-7/+25
| |
* | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-211-4/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cache:key to .gitlab-ci.yml allowing to fine tune the caching The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need: 1. Cache per-build for all branches: ``` cache: key: "$CI_BUILD_NAME" untracked: true ``` 2. Cache per-branch for all jobs: ``` cache: key: "$CI_BUILD_REF" untracked: true ``` /cc @DouweM @grzesiek @axil See merge request !2436
| * | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-keyKamil Trzcinski2016-01-201-4/+21
| | |
* | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-9/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cross projects detection when importing GitHub pull requests Fixes #12456 See merge request !2523
| * | | Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-201-9/+18
| |/ /
* | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+68
|\ \ \ | |/ /
| * | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-201-0/+68
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | * | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+68
| | | |
* | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-201-4/+8
|\ \ \ \ | |/ / /
| * | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-201-4/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493
| | * | Fix broken specs.issue_3749Rubén Dávila2016-01-191-4/+8
| | |/
* | | Update testsDouwe Maan2016-01-202-2/+2
| | |
* | | Properly handle HTML entities with inline diffsDouwe Maan2016-01-202-5/+5
| | |
* | | Merge branch 'master' into issue_3945Douwe Maan2016-01-201-1/+27
|\ \ \ | |/ /
| * | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-191-1/+27
| |/
* | Move parallel diff logic to separate classDouwe Maan2016-01-201-0/+22
| |
* | Add missing specsDouwe Maan2016-01-191-0/+21
| |
* | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-191-44/+19
| |
* | Add testsDouwe Maan2016-01-152-0/+42
| |
* | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1425-199/+1091
|\ \ | |/
| * Refactoring Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-141-4/+0
| |
| * Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatterDouglas Barbosa Alexandre2016-01-141-2/+2
| |
| * Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTMLDouglas Barbosa Alexandre2016-01-141-0/+93
| |
| * Import GitHub wiki into GitLabDouglas Barbosa Alexandre2016-01-141-0/+22
| |
| * Use Hash to store paths and entries metadata in artifacts browserGrzegorz Bizon2016-01-142-38/+36
| |
| * Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-141-8/+8
| |
| * Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-142-38/+60
| |
| * Fix specs for artifacts metadata after changing fixture contentGrzegorz Bizon2016-01-141-2/+3
| |
| * Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-142-8/+8
| | | | | | | | | | In this version we will support only relative paths in artifacts metadata. Support for absolute paths will be introduced later.