| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Backport some changes from EEes_backport | Valery Sizov | 2016-01-22 | 1 | -80/+2 |
| | | |||||
| * | Merge branch 'fix-diff-comments' into 'master' | Robert Speicher | 2016-01-22 | 2 | -5/+8 |
| |\ | | | | | | | | | More highlighted diff fixes See merge request !2545 | ||||
| | * | Properly highlight right side of parallel difffix-diff-comments | Douwe Maan | 2016-01-22 | 1 | -1/+3 |
| | | | |||||
| | * | Restore diff comments | Douwe Maan | 2016-01-22 | 1 | -4/+5 |
| | | | |||||
| * | | Merge branch 'unescaped-diffs' into 'master' | Robert Speicher | 2016-01-22 | 1 | -5/+11 |
| |\ \ | | | | | | | | | | | | | | | | | | | Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544 | ||||
| | * | | Fix | Douwe Maan | 2016-01-22 | 1 | -2/+2 |
| | | | | |||||
| | * | | Make sure non-highlighted diffs are still escapedunescaped-diffs | Douwe Maan | 2016-01-22 | 1 | -5/+11 |
| | |/ | |||||
| * | | Merge branch 'ci/recursive-artifacts-entries' into 'master' | Robert Speicher | 2016-01-21 | 2 | -3/+12 |
| |\ \ | |/ |/| | | | | | 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 | -3/+12 |
| | | | |||||
| * | | Fix import of GitHub's wiki when the repository has not been created | Douglas Barbosa Alexandre | 2016-01-21 | 1 | -2/+6 |
| | | | |||||
| * | | Merge branch 'fix-github-pull-requests-import' into 'master' | Robert Speicher | 2016-01-20 | 1 | -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 requests | Douglas Barbosa Alexandre | 2016-01-20 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'master' into issue_3945issue_3945 | Rubén Dávila | 2016-01-20 | 1 | -0/+34 |
| |\ \ \ | |/ / | |||||
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-only | Tomasz Maczukin | 2016-01-20 | 1 | -0/+34 |
| | | | | |||||
| * | | | Validate bounds just to be sure | Douwe Maan | 2016-01-20 | 1 | -0/+3 |
| | | | | |||||
| * | | | Properly highlight lines around '\ No newline at end of file' | Douwe Maan | 2016-01-20 | 3 | -7/+15 |
| | | | | |||||
| * | | | Save and use actual diff base commit for MR diff highlighting | Douwe Maan | 2016-01-20 | 3 | -9/+25 |
| | | | | |||||
| * | | | Properly handle HTML entities with inline diffs | Douwe Maan | 2016-01-20 | 3 | -15/+19 |
| | | | | |||||
| * | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 5 | -24/+34 |
| |\ \ \ | |/ / | |||||
| | * | | 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. | ||||
| * | | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 2 | -0/+121 |
| | | | |||||
| * | | Don't crash when file can't be highlighted | Douwe Maan | 2016-01-19 | 1 | -9/+3 |
| | | | |||||
| * | | Refactor Gitlab::Highlight and fix tests | Douwe Maan | 2016-01-19 | 1 | -6/+20 |
| | | | |||||
| * | | Remove useless assignments | Douwe Maan | 2016-01-19 | 1 | -2/+0 |
| | | | |||||
| * | | Add tests | Douwe Maan | 2016-01-15 | 2 | -0/+11 |
| | | | |||||
| * | | Whoops, forgot to add files | Douwe Maan | 2016-01-15 | 2 | -0/+160 |
| | | | |||||
| * | | Move inline diff marker logic to its own class | Douwe Maan | 2016-01-15 | 1 | -95/+11 |
| | | | |||||
| * | | Move inline diff logic to its own class | Douwe Maan | 2016-01-15 | 1 | -73/+11 |
| | | | |||||
| * | | Method was moved | Douwe Maan | 2016-01-15 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 33 | -233/+762 |
| |\ \ | |/ | |||||
| | * | 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 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |