summaryrefslogtreecommitdiff
path: root/lib
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-0130-426/+847
|\ \ | |/
| * 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 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
| * Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-0/+54
| |\
| | * 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
| |\ \ \
| | * | | 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
| * | | | Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-281-170/+181
| | |_|/ | |/| |
| * | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-274-6/+12
| |\ \ \
| | * | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-274-6/+12
| | | |/ | | |/|
| * | | Merge branch 'hot-reloading' into 'master' Douwe Maan2016-01-271-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | 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
| |/
| * Whitelist raw "abbr" elements when parsing MarkdownBenedict Etzel2016-01-231-0/+4
| * 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
| * | Merge branch 'workhorse-path' into 'master' Robert Speicher2016-01-212-3/+9
| |\ \
| | * | 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 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 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
| | |\ \ \
| | | * | | 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
| | |/ /
| * | | 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
| |\ \ \ | | |/ /
View Lorry Controller Status