summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...git-archive-refactorJacob Vosmaer2016-02-171-9/+12
|\
| * Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-171-9/+12
| |\
| | * Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-151-9/+12
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...Jacob Vosmaer2016-02-178-47/+159
|\ \ \ | |/ /
| * | 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 databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-112-9/+27
| * | | 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
| |/
| * 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
| * | Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipelineRobert Speicher2016-02-032-22/+37
| * | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-021-0/+35
| |/
| * Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-0/+8
* | First version of "git archive" headersJacob Vosmaer2016-02-021-0/+18
|/
* Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-313-26/+89
|\
| * 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
|/
* Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-68/+0
* Move blame group logic to dedicated classDouwe Maan2016-01-281-0/+24
* Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-261-0/+11
* Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-251-0/+10
* Whitelist raw "abbr" elements when parsing MarkdownBenedict Etzel2016-01-231-0/+5
* Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-212-7/+25
|\
| * 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 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 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
| |\ \
| | * | 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
| |\ \ \ | | |/ / | |/| |
| | * | 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