summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)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
| * Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-0/+54
| |\
| | * 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
| |\ \ | | |/ | |/|
| | * Use ActiveRecord::Base.connection.active? and rescue any exception in connect...fix-preventing-migration-from-crashing-in-specific-casesRémy Coutable2016-01-281-1/+4
| | * Only create the defaults ApplicationSetting when DB is fully migratedRémy Coutable2016-01-281-19/+16
| | * Ensure rake tasks that don't need a DB connection can be run without oneRémy Coutable2016-01-261-1/+1
| | * Fix preventing migration from crashing in very specific casesRémy Coutable2016-01-251-0/+7
| * | 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
| |/
| * Backport some changes from EEes_backportValery Sizov2016-01-221-80/+2
| * Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-222-5/+8
| |\
| | * 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
| |\ \
| | * | 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 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 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
| * | | 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
| * | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-2/+2
View Lorry Controller Status