Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Remove no longer required code. #3945 | Rubén Dávila | 2016-01-12 | 1 | -42/+9 | |
| | | | | ||||||
| * | | | Small fixes from code review. #3945 | Rubén Dávila | 2016-01-12 | 1 | -4/+0 | |
| | | | | ||||||
| * | | | Fix broken spec for submodule commit. #3945 | Rubén Dávila | 2016-01-09 | 1 | -2/+10 | |
| | | | | ||||||
| * | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-08 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Remove custom Lexer. #3945 [ci skip] | Rubén Dávila | 2016-01-08 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | Inline diff is going to be generated client side now. #3945 | |||||
| * | | | Change strategy to highlight diffs. #3945 | Rubén Dávila | 2016-01-07 | 2 | -20/+58 | |
| | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content. | |||||
| * | | | Don't process inline diffs on backend. #3945 | Rubén Dávila | 2016-01-07 | 2 | -108/+1 | |
| | | | | ||||||
| * | | | Apply syntax highlighting when expanding diff plus some refactor. #3945 | Rubén Dávila | 2015-12-31 | 1 | -12/+43 | |
| | | | | ||||||
| * | | | Don't modify "match" diff lines. #3945 | Rubén Dávila | 2015-12-30 | 1 | -1/+6 | |
| | | | | ||||||
| * | | | A bit of refactoring. #3945 | Rubén Dávila | 2015-12-30 | 2 | -9/+9 | |
| | | | | ||||||
| * | | | Fix broken spec and small refactor. #3945 | Rubén Dávila | 2015-12-30 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | Fix Rubocop complain. #3945 | Rubén Dávila | 2015-12-30 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | New implementation for highlighting diff files. #3945 | Rubén Dávila | 2015-12-30 | 3 | -0/+60 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly. | |||||
* | | | | Merge branch 'add_email_headers' into 'master' | Robert Speicher | 2016-01-19 | 1 | -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 services | Anton Baklanov | 2016-01-19 | 1 | -0/+1 | |
| | |_|/ | |/| | | | | | | | | | | Fixes #2098 | |||||
* | | | | Allow LDAP users to change their email if it was not set by the LDAP server | Douwe Maan | 2016-01-19 | 3 | -22/+29 | |
|/ / / | ||||||
* | | | Ensure that doesn't have pending migrations when running the specs | Douglas Barbosa Alexandre | 2016-01-19 | 1 | -1/+0 | |
| | | | ||||||
* | | | Fix signup for some OAuth providers | Steffen Köhler | 2016-01-15 | 1 | -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. | |||||
* | | Merge branch 'diff-parse-first-commit' into 'master' | Robert Speicher | 2016-01-14 | 1 | -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 repository | Douwe Maan | 2016-01-14 | 1 | -2/+3 | |
| | | | ||||||
* | | | Merge branch 'backport-ee' into 'master' | Robert Speicher | 2016-01-14 | 2 | -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 Banzai | Douwe Maan | 2016-01-14 | 2 | -4/+0 | |
| | | | | ||||||
* | | | | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter | Douglas Barbosa Alexandre | 2016-01-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Refactoring Gitlab::GithubImport::Importer | Douglas Barbosa Alexandre | 2016-01-14 | 1 | -7/+13 | |
| | | | | ||||||
* | | | | Import GitHub wiki into GitLab | Douglas Barbosa Alexandre | 2016-01-14 | 3 | -1/+34 | |
| | | | | ||||||
* | | | | Minor improvements in build arfifacts browserci/view-build-artifacts | Grzegorz Bizon | 2016-01-14 | 2 | -7/+14 | |
| | | | | | | | | | | | | | | | | | | | | Added also a `Gitlab::Ci::Build::Artifacts::Metadata::ParserError` exception class. | |||||
* | | | | Use Hash to store paths and entries metadata in artifacts browser | Grzegorz Bizon | 2016-01-14 | 2 | -18/+11 | |
| | | | | ||||||
* | | | | Improve readability of artifacts `Metadata` related code | Grzegorz Bizon | 2016-01-14 | 2 | -34/+24 | |
| | | | | ||||||
* | | | | Improve readability of artifacts browser `Entry` related code | Grzegorz Bizon | 2016-01-14 | 2 | -25/+27 | |
| | | | | ||||||
* | | | | Simplify encoding related implementation in artifacts metadata | Grzegorz Bizon | 2016-01-14 | 1 | -6/+5 | |
| | | | | ||||||
* | | | | Make encoding of paths returned by metadata consistent (UTF-8) | Grzegorz Bizon | 2016-01-14 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Improvements, readability for artifacts browser | Grzegorz Bizon | 2016-01-14 | 1 | -5/+7 | |
| | | | | ||||||
* | | | | Support only valid UTF-8 paths in build artifacts browser | Grzegorz Bizon | 2016-01-14 | 2 | -5/+13 | |
| | | | | ||||||
* | | | | Improve invalid build artifacts metadata path matcher | Grzegorz Bizon | 2016-01-14 | 1 | -5/+2 | |
| | | | | ||||||
* | | | | Render only valid paths in artifacts metadata | Grzegorz Bizon | 2016-01-14 | 2 | -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 Bizon | 2016-01-14 | 3 | -174/+153 | |
| | | | | ||||||
* | | | | Change format of artifacts metadata from text to binary 0.0.1 | Grzegorz Bizon | 2016-01-14 | 1 | -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 metadata | Grzegorz Bizon | 2016-01-14 | 2 | -9/+8 | |
| | | | | ||||||
* | | | | Add method that checks if path exists in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Render 404 when artifacts path is invalid | Grzegorz Bizon | 2016-01-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Do not depend on universe when checking parent in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -3/+12 | |
| | | | | ||||||
* | | | | Extract artifacts metadata implementation to separate class | Grzegorz Bizon | 2016-01-14 | 2 | -2/+59 | |
| | | | | ||||||
* | | | | Improve path sanitization in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -9/+8 | |
| | | | | ||||||
* | | | | Add path sanitization to `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -12/+27 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | Parse artifacts metadata stored in JSON format | Grzegorz Bizon | 2016-01-14 | 1 | -3/+9 | |
| | | | | ||||||
* | | | | Use metadata stored in artifacats metadata file | Grzegorz Bizon | 2016-01-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Use short method call in StringPath instead block | Grzegorz Bizon | 2016-01-14 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Improve performance of `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -4/+11 | |
| | | | | ||||||
* | | | | Add support for parent directories in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | This support is not completed though, as parent directory that is first in collection returned by `directories!` is not iterable yet. |