summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-4/+4
|
* Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-313-36/+52
|\ | | | | | | | | Mark inline difference between old and new paths when a file is renamed See merge request !2652
| * Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-293-36/+52
| |
* | First pass at deleting projects in the background.Josh Frye2016-01-291-2/+2
|/
* Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-282-139/+0
| | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
* Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-0/+54
|\ | | | | | | | | Fix highlighting in blame view. See merge request !2630
| * Merge branch 'master' into highlight-blameDouwe Maan2016-01-285-7/+13
| |\
| * | Move blame group logic to dedicated classDouwe Maan2016-01-281-0/+54
| | |
* | | Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into ↵Dmitriy Zaporozhets2016-01-281-12/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix preventing migration from crashing in very specific cases Closes #12606. Closes #12501. /cc @yorickpeterse @dbalexandre See merge request !2600
| * | | Use ActiveRecord::Base.connection.active? and rescue any exception in ↵fix-preventing-migration-from-crashing-in-specific-casesRémy Coutable2016-01-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | connect_to_db? This ensures that rake tasks that don't need a DB connection can be run without one.
| * | | Only create the defaults ApplicationSetting when DB is fully migratedRémy Coutable2016-01-281-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | Return a fake application settings OpenStruct when this is not the case. Also, use ActiveRecord::Base.connection_pool.active_connection? instead of ActiveRecord::Base.connection.active? to avoid driver exception.
| * | | Ensure rake tasks that don't need a DB connection can be run without oneRémy Coutable2016-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using ActiveRecord::Base.connection.active? without a DB connection, we get a "PG::ConnectionBad: could not connect to server" error because ActiveRecord::Base.connection doesn't exist. By using ActiveRecord::Base.connected? we ensure we don't get this error if the connection is missing, which is the all point of the Gitlab::CurrentSettings#connect_to_db? method!
| * | | Fix preventing migration from crashing in very specific casesRémy Coutable2016-01-251-0/+7
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details
* | | | Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-281-170/+181
| |_|/ |/| | | | | | | | | | | | | | | | | * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-274-6/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI runner version not being properly updated when asked for a build Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again. See merge request !2618
| * | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-274-6/+12
| | |/ | |/| | | | | | | | | | | | | Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again.
* | | Merge branch 'hot-reloading' into 'master' Douwe Maan2016-01-271-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix hot reloading for CI API See merge request !2617
| * | Fix hot reloading for CI APIhot-reloadingKamil Trzcinski2016-01-261-1/+1
| |/
* | Wrap errors on GitHub importer to raise Projects::ImportService::ErrorDouglas Barbosa Alexandre2016-01-262-7/+12
| |
* | Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-261-18/+29
| |
* | Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-251-3/+19
|/ | | | | | | | | | | | 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 MarkdownBenedict Etzel2016-01-231-0/+4
| | | | Closes #12517
* Backport some changes from EEes_backportValery Sizov2016-01-221-80/+2
|
* Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-222-5/+8
|\ | | | | | | | | More highlighted diff fixes See merge request !2545
| * Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
| |
| * Restore diff commentsDouwe Maan2016-01-221-4/+5
| |
* | Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-221-5/+11
|\ \ | | | | | | | | | | | | | | | | | | Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
| * | FixDouwe Maan2016-01-221-2/+2
| | |
| * | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-5/+11
| |/
* | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-212-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-entriesKamil Trzcinski2016-01-202-3/+12
| |
* | Merge branch 'workhorse-path' into 'master' Robert Speicher2016-01-212-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init script changes for gitlab-workhorse in 8.4 Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31 Also bumps gitlab-workhorse to 0.6.1. [ci skip] See merge request !2529
| * | Init script changes for gitlab-workhorse in 8.4Jacob Vosmaer2016-01-212-3/+9
| | |
* | | Fix import of GitHub's wiki when the repository has not been createdDouglas Barbosa Alexandre2016-01-211-2/+6
| | |
* | | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-211-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+8
| | | |
* | | | 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-202-0/+139
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-202-0/+139
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-202-0/+139
| | |/ /
* | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-201-0/+2
|\ \ \ \ | |/ / /
| * | | Gracefully handle invalid UTF-8 sequences in Markdown linksfix-error-500-with-invalid-utf8Stan Hu2016-01-201-0/+2
| |/ / | | | | | | | | | Closes #6077
* | | 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-209-30/+56
|\ \ \ | |/ /
| * | 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
View Lorry Controller Status