summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
|
* Restore diff commentsDouwe Maan2016-01-221-4/+5
|
* Fix import of GitHub's wiki when the repository has not been createdDouglas Barbosa Alexandre2016-01-211-2/+6
|
* Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-1/+5
|\ | | | | | | | | | | | | 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-1/+5
| |
* | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+34
|\ \ | |/
| * Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+34
| |
* | Validate bounds just to be sureDouwe Maan2016-01-201-0/+3
| |
* | Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-203-7/+15
| |
* | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-203-9/+25
| |
* | Properly handle HTML entities with inline diffsDouwe Maan2016-01-203-15/+19
| |
* | Merge branch 'master' into issue_3945Douwe Maan2016-01-205-24/+34
|\ \ | |/
| * Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-191-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added X-GitLab-... headers to emails from CI and Email On Push services Fixes #2098 This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and 'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way that it is done currently for merge requests and issues emails. Additionally, CI emails will have 'X-GitLab-Build-Status' header with either 'fail' or 'success'. Emails from Email On Push will include 'X-Gitlab-Author' header containing the username of user who did the push. See merge request !2159
| | * Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-191-0/+1
| | | | | | | | | | | | Fixes #2098
| * | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-193-22/+29
| |/
| * Ensure that doesn't have pending migrations when running the specsDouglas Barbosa Alexandre2016-01-191-1/+0
| |
| * Fix signup for some OAuth providersSteffen Köhler2016-01-151-1/+4
| | | | | | | | | | | | some OAuth providers (kerberos for example) only provide a username and an email, but no name. Therefore a signup fails because the name is empty. Best guess for the name is probably the username, therefore use it as name.
* | Move parallel diff logic to separate classDouwe Maan2016-01-202-0/+121
| |
* | Don't crash when file can't be highlightedDouwe Maan2016-01-191-9/+3
| |
* | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-191-6/+20
| |
* | Remove useless assignmentsDouwe Maan2016-01-191-2/+0
| |
* | Add testsDouwe Maan2016-01-152-0/+11
| |
* | Whoops, forgot to add filesDouwe Maan2016-01-152-0/+160
| |
* | Move inline diff marker logic to its own classDouwe Maan2016-01-151-95/+11
| |
* | Move inline diff logic to its own classDouwe Maan2016-01-151-73/+11
| |
* | Method was movedDouwe Maan2016-01-151-2/+2
| |
* | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1433-233/+762
|\ \ | |/
| * Merge branch 'diff-parse-first-commit' into 'master'Robert Speicher2016-01-141-2/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Properly generate diff of orphan commits, like the first commit in a repository Fixes gitlab-org/gitlab_git#14 See merge request !2427
| | * Properly generate diff of orphan commits, like the first commit in a repositoryDouwe Maan2016-01-141-2/+3
| | |
| * | Merge branch 'backport-ee' into 'master' Robert Speicher2016-01-142-4/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport two commits from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110 See merge request !2424
| | * | Prevent circular reference error in BanzaiDouwe Maan2016-01-142-4/+0
| | | |
| * | | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatterDouglas Barbosa Alexandre2016-01-141-1/+1
| | | |
| * | | Refactoring Gitlab::GithubImport::ImporterDouglas Barbosa Alexandre2016-01-141-7/+13
| | | |
| * | | Import GitHub wiki into GitLabDouglas Barbosa Alexandre2016-01-143-1/+34
| | | |
| * | | Minor improvements in build arfifacts browserci/view-build-artifactsGrzegorz Bizon2016-01-142-7/+14
| | | | | | | | | | | | | | | | | | | | Added also a `Gitlab::Ci::Build::Artifacts::Metadata::ParserError` exception class.
| * | | Use Hash to store paths and entries metadata in artifacts browserGrzegorz Bizon2016-01-142-18/+11
| | | |
| * | | Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-142-34/+24
| | | |
| * | | Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-142-25/+27
| | | |
| * | | Simplify encoding related implementation in artifacts metadataGrzegorz Bizon2016-01-141-6/+5
| | | |
| * | | Make encoding of paths returned by metadata consistent (UTF-8)Grzegorz Bizon2016-01-141-3/+3
| | | |
| * | | Improvements, readability for artifacts browserGrzegorz Bizon2016-01-141-5/+7
| | | |
| * | | Support only valid UTF-8 paths in build artifacts browserGrzegorz Bizon2016-01-142-5/+13
| | | |
| * | | Improve invalid build artifacts metadata path matcherGrzegorz Bizon2016-01-141-5/+2
| | | |
| * | | Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-142-7/+15
| | | | | | | | | | | | | | | | | | | | 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-143-174/+153
| | | |
| * | | Change format of artifacts metadata from text to binary 0.0.1Grzegorz Bizon2016-01-141-10/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-9/+8
| | | |
| * | | Add method that checks if path exists in `StringPath`Grzegorz Bizon2016-01-141-0/+4
| | | |
| * | | Render 404 when artifacts path is invalidGrzegorz Bizon2016-01-141-1/+1
| | | |
| * | | Do not depend on universe when checking parent in `StringPath`Grzegorz Bizon2016-01-141-3/+12
| | | |
View Lorry Controller Status