summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-142-58/+10
| |
| * Change format of artifacts metadata from text to binary 0.0.1Grzegorz Bizon2016-01-141-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 metadataGrzegorz Bizon2016-01-141-1/+1
| |
| * Add method that checks if path exists in `StringPath`Grzegorz Bizon2016-01-141-0/+13
| |
| * Render 404 when artifacts path is invalidGrzegorz Bizon2016-01-141-2/+4
| |
| * Do not depend on universe when checking parent in `StringPath`Grzegorz Bizon2016-01-141-1/+16
| |
| * Extract artifacts metadata implementation to separate classGrzegorz Bizon2016-01-141-0/+76
| |
| * Improve path sanitization in `StringPath`Grzegorz Bizon2016-01-141-1/+0
| |
| * Parse artifacts metadata stored in JSON formatGrzegorz Bizon2016-01-141-0/+16
| |
| * Fix rubocop offenses in `StringPath` specsGrzegorz Bizon2016-01-141-11/+19
| |
| * Add support for parent directories in `StringPath`Grzegorz Bizon2016-01-141-4/+14
| | | | | | | | | | This support is not completed though, as parent directory that is first in collection returned by `directories!` is not iterable yet.
| * Add support for root path for `StringPath`Grzegorz Bizon2016-01-141-1/+23
| |
| * Add implementation of remaining methods in `StringPath`Grzegorz Bizon2016-01-141-10/+43
| |
| * Improve `StringPath` specs (DRY)Grzegorz Bizon2016-01-141-10/+19
| |
| * Add `parent` iteration implementation to `StringPath`Grzegorz Bizon2016-01-141-1/+10
| |
| * Add new methods to StringPathGrzegorz Bizon2016-01-141-1/+32
| |
| * Add implementation of StringPath classGrzegorz Bizon2016-01-141-0/+21
| | | | | | | | | | | | | | `StringPath` class is something similar to Ruby's `Pathname` class, but does not involve any IO operations. `StringPath` objects require passing string representation of path, and array of paths that represents universe to constructor to be intantiated.
| * Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-21/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
| | * fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-3/+2
| | |
| | * LDAP synchronization block/unblock new statesGabriel Mazetto2016-01-081-20/+14
| | |
View Lorry Controller Status