summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactorJacob Vosmaer2016-02-171-0/+2
|\ | | | | | | git-archive-refactor
| * Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-171-0/+2
| |\ | | | | | | | | | | | | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
| | * Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-151-0/+2
| | | | | | | | | | | | Closes #13469
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-1713-47/+122
|\ \ \ | |/ / | | | | | | git-archive-refactor
| * | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-162-17/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
| | * | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-112-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
| * | | Fix undefined method `postgresql?` during migrationrs-gitlab-database-moduleRobert Speicher2016-02-151-6/+2
| | |/ | |/|
| * | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-122-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
| * | Load all blob data when highlighting content for git-blame.Rubén Dávila2016-02-111-0/+1
| |/
| * Merge branch 'freeze-constants-lib-gitlab-git' into 'master' Robert Speicher2016-02-091-3/+3
| |\ | | | | | | | | | | | | Freeze constants in Gitlab::Git See merge request !1730
| | * Freeze the expression instead of the literalZeger-Jan van de Weg2016-02-051-2/+1
| | | | | | | | | | | | Also remove the spec for it
| | * Minor refactoring on Gitlab::GitZeger-Jan van de Weg2016-02-051-3/+4
| | |
| * | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-091-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
| | * | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-041-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
| * | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-091-7/+3
| |\ \
| | * | one more improvement to snippet searchValery Sizov2016-02-051-1/+1
| | | |
| | * | Faster snippet searchValery Sizov2016-02-051-6/+2
| | |/
| * | 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/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-014-70/+52
| | |\ \
| | * | | 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
| * | | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-032-1/+41
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| | * | | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-022-1/+41
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-021-0/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ | | | |/ / /
| * | | | | 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-0118-244/+628
| |\ \ \ \ | | |/ / /
* | | | | Fix APIJacob Vosmaer2016-02-111-2/+2
| | | | |
* | | | | First version of "git archive" headersJacob Vosmaer2016-02-021-4/+23
| |_|/ / |/| | |
* | | | Gotta have newlinesJacob Vosmaer2016-02-011-1/+1
| | | |
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-0122-267/+657
|\ \ \ \ | | |/ / | |/| | | | | | git-raw-workhorse
| * | | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-293-36/+52
| | | |
| * | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-34/+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
| | * | 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
| * | | 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
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Backport some changes from EEes_backportValery Sizov2016-01-221-80/+2
| | |
View Lorry Controller Status