summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Douwe Maan2018-09-037-11/+26
|\ | | | | | | | | | | | | '6417-extract-ee-specific-files-lines-for-lib-gitlab-email-handler-rb' into 'master' Extract EE-specific lines from Gitlab::Email::Handler See merge request gitlab-org/gitlab-ce!21358
| * Remove requires from email handlersSean McGivern2018-09-031-5/+0
| |
| * Add frozen_string_literal: true to email handlersSean McGivern2018-09-037-0/+14
| |
| * Extract EE-specific lines from Gitlab::Email::HandlerSean McGivern2018-09-031-7/+13
| |
* | Merge branch 'sh-improve-bitbucket-server-logging' into 'master'Rémy Coutable2018-09-032-3/+69
|\ \ | | | | | | | | | | | | Add JSON logging for Bitbucket Server importer See merge request gitlab-org/gitlab-ce!21378
| * | Add JSON logging for Bitbucket Server importerStan Hu2018-08-302-3/+69
| | | | | | | | | | | | Adds an importer.log so that it's easier to track what's happening with the import.
* | | Merge branch '50564-chat-service-refactoring' into 'master'Nick Thomas2018-09-031-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use sample data if repo has no commit in ChatService Closes #50564 See merge request gitlab-org/gitlab-ce!21440
| * | | Use sample data for push event when no commits createdTakuya Noguchi2018-08-311-2/+6
| | | |
* | | | Merge branch 'issue_48084' into 'master'Sean McGivern2018-09-031-9/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a serializer to render diff lines Closes #48084 See merge request gitlab-org/gitlab-ce!21260
| * | | | Use a serializer to render diff linesFelipe Artur2018-08-311-9/+3
| | | | |
* | | | | Merge branch 'feature/#32877-add-default-field-branch-api' into 'master'Robert Speicher2018-09-011-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add default parameter to branches API Closes #32877 See merge request gitlab-org/gitlab-ce!21294
| * | | | | Add default parameter to branches APIRiccardo Padovani2018-08-181-0/+4
| | | | | |
* | | | | | Merge branch 'ash.mckenzie/allow-auth-via-jwt' into 'master'Robert Speicher2018-08-311-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Allow auth via JWT (always false in CE) See merge request gitlab-org/gitlab-ce!21038
| * | | | | Allow auth via JWT (always false in CE)ash.mckenzie/allow-auth-via-jwtAsh McKenzie2018-08-141-0/+6
| | | | | |
* | | | | | Merge branch '47765-group-visibility-error-due-to-string-conversion' into ↵Douwe Maan2018-08-311-1/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Changes update_column to update_attributes in ProjectTreeRestorer#restore_project by using timeless to maintain the current timestamps Closes #47765 See merge request gitlab-org/gitlab-ce!21242
| * | | | | Changes update_column to update_attributes in ↵Tiago Botelho2018-08-281-1/+4
| | |/ / / | |/| | | | | | | | | | | | | ProjectTreeRestorer#restore_project by using timeless to maintain the current timestamps
* | | | | Merge branch '50414-rubocop-rule-to-enforce-class-methods-over-module' into ↵Sean McGivern2018-08-305-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Make a Rubocop cop to prefer class_methods over ClassMethods for ActiveSupport::Concern" Closes #50414 See merge request gitlab-org/gitlab-ce!21379
| * | | | | Updates code using class_methods over module ClassMethodsJacopo2018-08-295-5/+5
| | |_|/ / | |/| | |
* | | | | Fix Error 500s due to encoding issues when Wiki hooks fireStan Hu2018-08-291-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saved Wiki content goes through the GitalyClient::WikiService, which calls StringIO#set_encoding on the input stream. The problem is that this call mutates the encoding of the given string object to ASCII-88BIT, which causes problems for models expecting the data to still be in UTF-8. Freezing the input disables this behavior: https://github.com/ruby/ruby/blob/v2_4_4/ext/stringio/stringio.c#L1583 Closes #50590
* | | | Merge branch 'rails5-silence-stream' into 'master'Sean McGivern2018-08-291-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rails 5: replace removed silence_stream See merge request gitlab-org/gitlab-ce!21387
| * | | | Rails 5: replace removed silence_streamJasper Maes2018-08-281-1/+12
| | | | |
* | | | | Include rich_text in diff cache keysSean McGivern2018-08-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this wasn't needed: text was normally set to the highlighted contents anyway. Now, it is: we store different things in text and rich_text. This caused https://gitlab.com/gitlab-com/production/issues/439.
* | | | | Escaped html charactersChantal Rollison2018-08-282-2/+2
| | | | |
* | | | | Resolve "Orphaned upload files are accessible via project exports"Michael Kozono2018-08-281-8/+11
| | | | |
* | | | | Block link-local addresses in URLBlockerStan Hu2018-08-281-0/+8
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-com/migration/issues/766
* | | | | Removes <br> sent from backend on tooltips in jobsFilipa Lacerda2018-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | When backend sends HTML it requires frontend to append it to the DOM causing XSS vulnerabilities. By removing the `<br>` we avoid those vulnerabilities
* | | | | Merge branch 'fldubois/gitlab-ce-fix-api-group-createdat' into 'master'Rémy Coutable2018-08-282-11/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow date parameters on Issues, Notes, and Discussions API for group owners Closes #40059 See merge request gitlab-org/gitlab-ce!21342
| * | | | | Use policies to determine if attributes can be set in the APISean McGivern2018-08-222-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is more idiomatic than checking membership explicitly.
| * | | | | Allow date parameters on Issues and Notes API for group ownersFlorent Dubois2018-08-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow `created_at` and `updated_at` parameters on Issues API - Allow `created_at` on Issue Notes API Closes gitlab-org/gitlab-ce#40059
* | | | | | Merge branch 'issue_36138' into 'master'Sean McGivern2018-08-282-3/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to delete group milestones Closes #36138 See merge request gitlab-org/gitlab-ce!21057
| * | | | | | Allow to delete group milestonesissue_36138Felipe Artur2018-08-062-3/+14
| | | | | | |
* | | | | | | Merge branch 'bvl-add-galician' into 'master'Grzegorz Bizon2018-08-271-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Galician as an available language Closes #43227 See merge request gitlab-org/gitlab-ce!21202
| * | | | | | Add Galician as an available languagebvl-add-galicianBob Van Landuyt2018-08-141-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sh-insert-git-data-in-separate-transaction' into 'master'Yorick Peterse2018-08-262-8/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitbucket Server importer: Eliminate most idle-in-transaction issues See merge request gitlab-org/gitlab-ce!21173
| * | | | | | Bitbucket Server importer: Eliminate most idle-in-transaction issuesStan Hu2018-08-262-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like with the GitHub importer, the Bitbucket Server importer can hit the default 60 s idle-in-transaction timeouts if it takes too long to create the merge request. We solve this by using the same approach as the GitHub importer: 1. Bypass all validation and hooks in creating a merge request 2. Insert the Git data in a separate transaction Part of #50021
* | | | | | | API: Protected tagsRobert Schilling2018-08-253-4/+89
| | | | | | |
* | | | | | | Merge branch '50345-hashed-storage-feature-flag' into 'master'Nick Thomas2018-08-251-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature flag to disable Hashed Storage migration when renaming a repository Closes #50345 See merge request gitlab-org/gitlab-ce!21291
| * | | | | | Fixed `stub_feature_flag behavior` for `disabled?` flags.Gabriel Mazetto2018-08-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous code would not work with `disabled?` because that method would send two parameters (second always `nil`) which we are not mocking. Instead of mock yet another state, I decide to fix it where it belongs.
* | | | | | | Merge branch 'sh-simplify-github-importer-refactor' into 'master'Yorick Peterse2018-08-245-91/+118
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor GitHub Importer database helpers into helper methods See merge request gitlab-org/gitlab-ce!21357
| * | | | | | | Refactor GitHub Importer database helpers into helper methodsStan Hu2018-08-245-91/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This in preparation for addressing idle-in-transaction timeouts for other importers. Part of #50021
* | | | | | | | Allows author to vote on their own issueChantal Rollison2018-08-241-1/+1
|/ / / / / / /
* | | | | | | Merge branch '6965-backport-to-ce' into 'master'Stan Hu2018-08-231-10/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport LDAP changes to CE See merge request gitlab-org/gitlab-ce!21361
| * | | | | | | Backport LDAP changes to CEDouglas Barbosa Alexandre2018-08-231-10/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch ↵Nick Thomas2018-08-231-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43096-controller-projects-issuescontroller-referenced_merge_requests-json-executes-more-than-100-sql-queries' into 'master' Resolve "Controller Projects::IssuesController#referenced_merge_requests.json executes more than 100 SQL queries" Closes #43096 See merge request gitlab-org/gitlab-ce!21237
| * | | | | | Fix routes N+1 in Issues::ReferencedMergeRequestsService#executeSean McGivern2018-08-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting here needs the project routes to be loaded, including the namespace routes.
* | | | | | | Merge branch 'ccr/48800/ping_for_boards' into 'master'Sean McGivern2018-08-231-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added count for label, assignee, and milestone lists Closes #48800 See merge request gitlab-org/gitlab-ce!21208
| * | | | | | | Added count for label, assignee, and milestone listsccr/48800/ping_for_boardsChantal Rollison2018-08-211-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jprovazn-fix-form-uploads' into 'master'Kamil Trzciński2018-08-231-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add public/uploads/tmp to allowed upload paths Closes #49585 See merge request gitlab-org/gitlab-ce!20942
| * | | | | | | Add public/uploads/tmp to allowed upload pathsjprovazn-fix-form-uploadsJan Provaznik2018-08-211-3/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When direct_upload is enabled and a for file is being uploaded, then workhorse uses `public/uploads/tmp` path. If `uploads.storage_path` i sset to a different directory, then upload fails because `public/uploads/tmp` is not in allowed paths.
* | | | | | | Fix broken Git over HTTP clones with LDAP usersStan Hu2018-08-221-0/+1
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a regression in !20608, the LDAP authenticator was not being used unless OmniAuth was enabled. This change allows the LDAP provider to be used if it is configured regardless of the OmniAuth setting. Closes #50579
View Lorry Controller Status