Age | Commit message (Collapse) | Author | |
---|---|---|---|
2016-02-04 | Merge 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-04 | Merge remote-tracking branch 'origin/rs-database-info' | Dmitriy Zaporozhets | |
2016-02-04 | Make Pipelines responsible for defining their custom whitelist | Robert Speicher | |
This allows for future pipelines to more easily define a custom whitelist. | |||
2016-02-03 | Merge 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-03 | Display database type and version in Administration dashboard | Robert Speicher | |
Closes #12900 | |||
2016-02-02 | Merge branch 'patch-1' into 'master' | Robert Speicher | |
Consistent rails_socket use. [ci skip] See merge request !2596 | |||
2016-02-02 | Merge branch 'git-raw-workhorse' into 'master' | Jacob Vosmaer | |
Send raw Git blobs via gitlab-workhorse See merge request !2451 | |||
2016-02-02 | fixed move project method in migration | James Lopez | |
2016-02-02 | Merge 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-02 | Fix add_pagination_headers to keep request parameters in Link header | Michi302 | |
2016-02-02 | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue | James Lopez | |
2016-02-02 | Merge remote-tracking branch 'origin/master' into git-raw-workhorse | Jacob Vosmaer | |
2016-02-02 | Merge remote-tracking branch 'origin/master' into lazy-blobs | Jacob Vosmaer | |
2016-02-02 | Memoize Akismet client initialization on AkismetHelper | Douglas Barbosa Alexandre | |
2016-02-02 | Refactor spam filtering on issues API | Douglas Barbosa Alexandre | |
2016-02-02 | Support Akismet spam checking for creation of issues via API | Stan 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-01 | Allow "@" in file names and path | Jacob Vosmaer | |
2016-02-01 | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue | James Lopez | |
2016-02-01 | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs | Jacob Vosmaer | |
2016-02-01 | Gotta have newlines | Jacob Vosmaer | |
2016-02-01 | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jacob Vosmaer | |
git-raw-workhorse | |||
2016-02-01 | Use only one header to send git blobs | Jacob Vosmaer | |
2016-02-01 | WIP lazy blobs | Jacob Vosmaer | |
2016-01-31 | Merge 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-29 | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | |
2016-01-29 | refactor previous test and add validation to project model | James Lopez | |
2016-01-29 | First pass at deleting projects in the background. | Josh Frye | |
2016-01-29 | Partially 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-28 | Merge branch 'highlight-blame' into 'master' | Robert Speicher | |
Fix highlighting in blame view. See merge request !2630 | |||
2016-01-28 | Send more raw blob data with workhorse | Jacob Vosmaer | |
2016-01-28 | Merge 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-28 | Merge branch 'master' into highlight-blame | Douwe Maan | |
2016-01-28 | Move blame group logic to dedicated class | Douwe Maan | |
2016-01-28 | Improve consistency and duplication for Merge Request API | Dmitriy 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-28 | Use 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-28 | Only create the defaults ApplicationSetting when DB is fully migrated | Ré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-27 | Merge 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-27 | Merge branch 'hot-reloading' into 'master' | Douwe Maan | |
Fix hot reloading for CI API See merge request !2617 | |||
2016-01-27 | Fix CI runner version not being properly updated when asking for a build | Kamil 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-26 | Fix hot reloading for CI API | Kamil Trzcinski | |
2016-01-26 | Ensure rake tasks that don't need a DB connection can be run without one | Ré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-26 | Wrap errors on GitHub importer to raise Projects::ImportService::Error | Douglas Barbosa Alexandre | |
2016-01-26 | Move Gitlab::BitbucketImport::KeyDeleter to it's own importer | Douglas Barbosa Alexandre | |
2016-01-25 | Correct arity for instrumented methods w/o args | Yorick 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-25 | Fix preventing migration from crashing in very specific cases | Rémy Coutable | |
See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details | |||
2016-01-25 | Consistent rails_socket use. | fbretel | |
2016-01-23 | Whitelist raw "abbr" elements when parsing Markdown | Benedict Etzel | |
Closes #12517 | |||
2016-01-22 | Backport some changes from EE | Valery Sizov | |
2016-01-22 | Merge branch 'fix-diff-comments' into 'master' | Robert Speicher | |
More highlighted diff fixes See merge request !2545 | |||
2016-01-22 | Merge 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 |