Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2016-02-04Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan
Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
2016-02-04Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets
2016-02-04Make Pipelines responsible for defining their custom whitelistRobert Speicher
This allows for future pipelines to more easily define a custom whitelist.
2016-02-03Merge branch 'support-akismet' into 'master' Robert Speicher
Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
2016-02-03Display database type and version in Administration dashboardRobert Speicher
Closes #12900
2016-02-02Merge branch 'patch-1' into 'master' Robert Speicher
Consistent rails_socket use. [ci skip] See merge request !2596
2016-02-02Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer
Send raw Git blobs via gitlab-workhorse See merge request !2451
2016-02-02fixed move project method in migrationJames Lopez
2016-02-02Merge branch 'Michi302/gitlab-ce-fix/pagination-links' into 'master' Dmitriy Zaporozhets
Fix add_pagination_headers to keep request parameters in Link header Originally opened at !2321. Closes #5904. /cc @Michi302 See merge request !2674
2016-02-02Fix add_pagination_headers to keep request parameters in Link headerMichi302
2016-02-02Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez
2016-02-02Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer
2016-02-02Merge remote-tracking branch 'origin/master' into lazy-blobsJacob Vosmaer
2016-02-02Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre
2016-02-02Refactor spam filtering on issues APIDouglas Barbosa Alexandre
2016-02-02Support Akismet spam checking for creation of issues via APIStan Hu
Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
2016-02-01Allow "@" in file names and pathJacob Vosmaer
2016-02-01Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez
2016-02-01Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer
2016-02-01Gotta have newlinesJacob Vosmaer
2016-02-01Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer
git-raw-workhorse
2016-02-01Use only one header to send git blobsJacob Vosmaer
2016-02-01WIP lazy blobsJacob Vosmaer
2016-01-31Merge branch 'rename-inline-diff' into 'master' Robert Speicher
Mark inline difference between old and new paths when a file is renamed See merge request !2652
2016-01-29Mark inline difference between old and new paths when a file is renamedDouwe Maan
2016-01-29refactor previous test and add validation to project modelJames Lopez
2016-01-29First pass at deleting projects in the background.Josh Frye
2016-01-29Partially revert "Add IP check against DNSBLs at account sign-up"Robert Speicher
This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
2016-01-28Merge branch 'highlight-blame' into 'master' Robert Speicher
Fix highlighting in blame view. See merge request !2630
2016-01-28Send more raw blob data with workhorseJacob Vosmaer
2016-01-28Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into ↵Dmitriy Zaporozhets
'master' Fix preventing migration from crashing in very specific cases Closes #12606. Closes #12501. /cc @yorickpeterse @dbalexandre See merge request !2600
2016-01-28Merge branch 'master' into highlight-blameDouwe Maan
2016-01-28Move blame group logic to dedicated classDouwe Maan
2016-01-28Improve consistency and duplication for Merge Request APIDmitriy Zaporozhets
* Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-28Use ActiveRecord::Base.connection.active? and rescue any exception in ↵Rémy Coutable
connect_to_db? This ensures that rake tasks that don't need a DB connection can be run without one.
2016-01-28Only create the defaults ApplicationSetting when DB is fully migratedRémy Coutable
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.
2016-01-27Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher
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
2016-01-27Merge branch 'hot-reloading' into 'master' Douwe Maan
Fix hot reloading for CI API See merge request !2617
2016-01-27Fix CI runner version not being properly updated when asking for a buildKamil Trzcinski
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.
2016-01-26Fix hot reloading for CI APIKamil Trzcinski
2016-01-26Ensure rake tasks that don't need a DB connection can be run without oneRémy Coutable
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!
2016-01-26Wrap errors on GitHub importer to raise Projects::ImportService::ErrorDouglas Barbosa Alexandre
2016-01-26Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre
2016-01-25Correct arity for instrumented methods w/o argsYorick Peterse
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
2016-01-25Fix preventing migration from crashing in very specific casesRémy Coutable
See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details
2016-01-25Consistent rails_socket use.fbretel
2016-01-23Whitelist raw "abbr" elements when parsing MarkdownBenedict Etzel
Closes #12517
2016-01-22Backport some changes from EEValery Sizov
2016-01-22Merge branch 'fix-diff-comments' into 'master' Robert Speicher
More highlighted diff fixes See merge request !2545
2016-01-22Merge branch 'unescaped-diffs' into 'master' Robert Speicher
Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544