summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Make sure there is a connection before using ActiveRecordbackup-database-timeout-fixJeroen Nijhof2016-02-081-0/+3
| |/ / / /
* | | | | Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into ↵Robert Speicher2016-02-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix CurrentSettings autoload bug in development _Originally opened at !2526 by @huacnlee._ - - - In development env, when we changed any file hit Rails reload, it will failed with this message: ``` A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active ``` See merge request !2753
| * | | | | Fix CurrentSettings autoload bug in development.huacnlee/current-settings-autoload-bug-in-developmentJason Lee2016-02-081-2/+2
| |/ / / / | | | | | | | | | | | | | | | Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
* | | | | Merge branch 'fix-init' into 'master' Rémy Coutable2016-02-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed init.d script not working on OS X -s flag of su doesn't work correctly on OS X, logging in as the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue Fixes Issue #3309 See merge request !1728
| * | | | | Fixed init.d script not working on OS Xritave2016-02-081-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | -s flag of su doesn't work correctly on some systems, loging in the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue
* | | | | suppress only errors in init-script while determining canonical path of ↵Harald Spaethe2016-02-081-1/+1
|/ / / / | | | | | | | | | | | | gitlab_workhorse_dir
* | | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-042-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | fixed move project method in migrationJames Lopez2016-02-021-1/+1
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-021-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-016-177/+54
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | refactor previous test and add validation to project modelJames Lopez2016-01-291-2/+2
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-041-6/+32
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-021-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | Closes #12900
* | | | | | Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipelineRobert Speicher2016-02-032-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for future pipelines to more easily define a custom whitelist.
* | | | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-033-2/+63
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistent rails_socket use. [ci skip] See merge request !2596
| * | | | | Consistent rails_socket use.fbretel2016-01-251-1/+1
| | | | | |
* | | | | | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-022-2/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send raw Git blobs via gitlab-workhorse See merge request !2451
| * \ \ \ \ \ 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 ↵Jacob Vosmaer2016-02-0136-455/+898
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | git-raw-workhorse
| * | | | | 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 header Originally opened at !2321. Closes #5904. /cc @Michi302 See merge request !2674
| * | | | | | 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 renamed See merge request !2652
| | * | | | 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
| | |_|/ | |/| | | | | | | | | | | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
| * | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-0/+54
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| | * \ \ 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix preventing migration from crashing in very specific cases Closes #12606. Closes #12501. /cc @yorickpeterse @dbalexandre See merge request !2600
| | * | | | | Use ActiveRecord::Base.connection.active? and rescue any exception in ↵fix-preventing-migration-from-crashing-in-specific-casesRémy Coutable2016-01-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect_to_db? This ensures that rake tasks that don't need a DB connection can be run without one.
| | * | | | | Only create the defaults ApplicationSetting when DB is fully migratedRémy Coutable2016-01-281-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Ensure rake tasks that don't need a DB connection can be run without oneRémy Coutable2016-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
| | * | | | | Fix preventing migration from crashing in very specific casesRémy Coutable2016-01-251-0/+7
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details
| * | | | | Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-281-170/+181
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-274-6/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-274-6/+12
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch 'hot-reloading' into 'master' Douwe Maan2016-01-271-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix hot reloading for CI API See merge request !2617
| | * | | 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
| | | |
View Lorry Controller Status