summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipelineRobert Speicher2016-02-032-9/+13
* Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-033-2/+63
|\
| * Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre2016-02-021-2/+2
| * Refactor spam filtering on issues APIDouglas Barbosa Alexandre2016-02-021-7/+8
| * Support Akismet spam checking for creation of issues via APIStan Hu2016-02-023-2/+62
* | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-021-1/+1
|\ \
| * | Consistent rails_socket use.fbretel2016-01-251-1/+1
* | | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-022-2/+23
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer2016-02-021-4/+4
| |\ \ \ | | | |/ | | |/|
| * | | Gotta have newlinesJacob Vosmaer2016-02-011-1/+1
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw...Jacob Vosmaer2016-02-0136-455/+898
| |\ \ \
| * | | | Use only one header to send git blobsJacob Vosmaer2016-02-012-4/+23
| * | | | Send more raw blob data with workhorseJacob Vosmaer2016-01-281-2/+4
* | | | | Merge branch 'Michi302/gitlab-ce-fix/pagination-links' into 'master' Dmitriy Zaporozhets2016-02-021-5/+15
|\ \ \ \ \
| * | | | | Fix add_pagination_headers to keep request parameters in Link headerMichi3022016-02-021-5/+15
| | |_|/ / | |/| | |
* | | | | 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
View Lorry Controller Status