summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-021-4/+4
|\
| * Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-4/+4
| |
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-0118-244/+628
|\ \ | |/
| * Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-293-36/+52
| |
| * Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-34/+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
| | * 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
| * | 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
| * 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
| | |
| * | 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
| |\ \ | |/ / |/| |
| * | 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
| |\ \
| * | | More refactoring from last code review. #3945Rubén Dávila2016-01-142-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
| * | | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-143-34/+181
| | | |
| * | | Refactor highlighting linesDouwe Maan2016-01-141-25/+4
| | | |
| * | | Remove duplication around highlighting.Douwe Maan2016-01-142-12/+24
| | | |
| * | | Use #sub instead of #gsub!. #3945Rubén Dávila2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * This is because is not a good idea to modify the original lines * Also I run into this issue https://gitlab.com/gitlab-org/gitlab_git/issues/14 which is returning Diff Lines with the same @new_pos value.
| * | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-2/+2
| | | |
View Lorry Controller Status