Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow "@" in file names and pathallow-@ | Jacob Vosmaer | 2016-02-01 | 1 | -0/+8 |
| | |||||
* | Merge branch 'rename-inline-diff' into 'master' | Robert Speicher | 2016-01-31 | 3 | -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 one | Douwe Maan | 2016-01-30 | 1 | -24/+24 |
| | | |||||
| * | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 3 | -27/+90 |
| | | |||||
* | | Increase the minimum length for commit SHA matching to 7rs-issue-12706 | Robert Speicher | 2016-01-29 | 1 | -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-blocking | Robert Speicher | 2016-01-28 | 1 | -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 class | Douwe Maan | 2016-01-28 | 1 | -0/+24 |
| | |||||
* | Update ExternalIssue regex for JIRA integration | Blake Hitchcock | 2016-01-26 | 1 | -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-signature | Yorick Peterse | 2016-01-25 | 1 | -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 Markdown | Benedict Etzel | 2016-01-23 | 1 | -0/+5 |
| | | | | Closes #12517 | ||||
* | Merge branch 'ci/recursive-artifacts-entries' into 'master' | Robert Speicher | 2016-01-21 | 2 | -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-entries | Kamil Trzcinski | 2016-01-20 | 2 | -7/+25 |
| | | |||||
* | | Merge branch 'ci/cache-key' into 'master' | Douwe Maan | 2016-01-21 | 1 | -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-key | Kamil Trzcinski | 2016-01-20 | 1 | -4/+21 |
| | | | |||||
* | | | Merge branch 'fix-github-pull-requests-import' into 'master' | Robert Speicher | 2016-01-20 | 1 | -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 requests | Douglas Barbosa Alexandre | 2016-01-20 | 1 | -9/+18 |
| |/ / | |||||
* | | | Merge branch 'master' into issue_3945issue_3945 | Rubén Dávila | 2016-01-20 | 1 | -0/+68 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'feature/check-against-rbl-only' into 'master' | Robert Speicher | 2016-01-20 | 1 | -0/+68 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515 | ||||
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-only | Tomasz Maczukin | 2016-01-20 | 1 | -0/+68 |
| | | | | |||||
* | | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 1 | -4/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'issue_3749' into 'master' | Douwe Maan | 2016-01-20 | 1 | -4/+8 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493 | ||||
| | * | | Fix broken specs.issue_3749 | Rubén Dávila | 2016-01-19 | 1 | -4/+8 |
| | |/ | |||||
* | | | Update tests | Douwe Maan | 2016-01-20 | 2 | -2/+2 |
| | | | |||||
* | | | Properly handle HTML entities with inline diffs | Douwe Maan | 2016-01-20 | 2 | -5/+5 |
| | | | |||||
* | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 1 | -1/+27 |
|\ \ \ | |/ / | |||||
| * | | Allow LDAP users to change their email if it was not set by the LDAP server | Douwe Maan | 2016-01-19 | 1 | -1/+27 |
| |/ | |||||
* | | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 1 | -0/+22 |
| | | |||||
* | | Add missing specs | Douwe Maan | 2016-01-19 | 1 | -0/+21 |
| | | |||||
* | | Refactor Gitlab::Highlight and fix tests | Douwe Maan | 2016-01-19 | 1 | -44/+19 |
| | | |||||
* | | Add tests | Douwe Maan | 2016-01-15 | 2 | -0/+42 |
| | | |||||
* | | Merge branch 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 25 | -199/+1091 |
|\ \ | |/ | |||||
| * | Refactoring Banzai::Filter::GollumTagsFilter | Douglas Barbosa Alexandre | 2016-01-14 | 1 | -4/+0 |
| | | |||||
| * | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter | Douglas Barbosa Alexandre | 2016-01-14 | 1 | -2/+2 |
| | | |||||
| * | Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML | Douglas Barbosa Alexandre | 2016-01-14 | 1 | -0/+93 |
| | | |||||
| * | Import GitHub wiki into GitLab | Douglas Barbosa Alexandre | 2016-01-14 | 1 | -0/+22 |
| | | |||||
| * | Use Hash to store paths and entries metadata in artifacts browser | Grzegorz Bizon | 2016-01-14 | 2 | -38/+36 |
| | | |||||
| * | Improve readability of artifacts `Metadata` related code | Grzegorz Bizon | 2016-01-14 | 1 | -8/+8 |
| | | |||||
| * | Improve readability of artifacts browser `Entry` related code | Grzegorz Bizon | 2016-01-14 | 2 | -38/+60 |
| | | |||||
| * | Fix specs for artifacts metadata after changing fixture content | Grzegorz Bizon | 2016-01-14 | 1 | -2/+3 |
| | | |||||
| * | Render only valid paths in artifacts metadata | Grzegorz Bizon | 2016-01-14 | 2 | -8/+8 |
| | | | | | | | | | | In this version we will support only relative paths in artifacts metadata. Support for absolute paths will be introduced later. | ||||
| * | Simplify implementation of build artifacts browser (refactoring) | Grzegorz Bizon | 2016-01-14 | 2 | -58/+10 |
| | | |||||
| * | Change format of artifacts metadata from text to binary 0.0.1 | Grzegorz Bizon | 2016-01-14 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the format of metadata to handle paths, that may contain whitespace characters, new line characters and non-UTF-8 characters. Now those paths along with metadata in JSON format are stored as length-prefixed strings (uint32 prefix). Metadata file has a custom format: 1. First string field is metadata version field (string) 2. Second string field is metadata errors field (JSON strong) 3. All subsequent fields is pair of path (string) and path metadata in JSON format. Path's metadata contains all fields that where possible to extract from ZIP archive like date of modification, CRC, compressed size, uncompressed size and comment. | ||||
| * | Show file size in artifacts browser using metadata | Grzegorz Bizon | 2016-01-14 | 1 | -1/+1 |
| | | |||||
| * | Add method that checks if path exists in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -0/+13 |
| | | |||||
| * | Render 404 when artifacts path is invalid | Grzegorz Bizon | 2016-01-14 | 1 | -2/+4 |
| | | |||||
| * | Do not depend on universe when checking parent in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -1/+16 |
| | | |||||
| * | Extract artifacts metadata implementation to separate class | Grzegorz Bizon | 2016-01-14 | 1 | -0/+76 |
| | | |||||
| * | Improve path sanitization in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -1/+0 |
| | | |||||
| * | Parse artifacts metadata stored in JSON format | Grzegorz Bizon | 2016-01-14 | 1 | -0/+16 |
| | | |||||
| * | Fix rubocop offenses in `StringPath` specs | Grzegorz Bizon | 2016-01-14 | 1 | -11/+19 |
| | |