summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'osw-suggestion-diff-lines-strategy' into 'master'Douglas Barbosa Alexandre2019-03-181-0/+37
|\ | | | | | | | | Implement suggestion diff lines parser See merge request gitlab-org/gitlab-ce!26069
| * Implement suggestion diff lines parserOswaldo Ferreira2019-03-181-0/+37
| |
* | Replaced config accessDominic Renner2019-03-181-1/+1
| | | | | | | | Replaced Settings with Gitlab.config for uniformity
* | Merge branch 'resolve-lib-gitlab-differences' into 'master'Robert Speicher2019-03-1810-11/+34
|\ \ | | | | | | | | | | | | Move EE specific code out of lib/gitlab See merge request gitlab-org/gitlab-ce!25741
| * | Backport EE changes to UserExtractor to CEYorick Peterse2019-03-181-1/+4
| | | | | | | | | | | | | | | This backports the changes EE made to Gitlab::UserExtractor, removing the need for an EE specific module.
| * | Fix whitespace in IssueBuilder/MergeRequestBuilderYorick Peterse2019-03-152-2/+2
| | |
| * | Backport support for finding EE workersYorick Peterse2019-03-121-1/+3
| | | | | | | | | | | | | | | | | | This backports support for finding EE workers in ee/app/workers from EE to CE, since we already do this for the configuration paths constant. This removes the need for EE specific modules.
| * | Backport try_megabytes_to_bytes from EEYorick Peterse2019-03-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | EE adds this method to Gitlab::Utils, which is also required by our SimpleCov helper. This prevents us from injecting EE modules into Gitlab::Utils, because the necessary bits for this are not yet in place. To work around this we just backport try_megabytes_to_bytes, as there's no particular reason to keep this in EE only.
| * | Backport allow_mirror_update for Chain::CommandYorick Peterse2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | This backports the allow_mirror_update update field for Chain::Command from EE to CE. There's no particular reason to keep this in EE. Doing so would require refactoring of CE as there currently is no easy way to inject new Struct members into the Chain::Command class.
| * | Backport Gitaly dynamic timeouts from EEYorick Peterse2019-03-122-4/+11
| | | | | | | | | | | | | | | | | | EE added the ability to set timeouts when handling blobs. Since there's no particular reason for this to be EE specific we can just backport this to CE.
| * | Refactor Gitlab::Favicon for EEYorick Peterse2019-03-121-1/+7
| | | | | | | | | | | | | | | This moves the development favicon name in Gitlab::Favicon to a separate method, allowing EE to redefine it to return a custom favicon.
| * | Backport Gitlab::Ci::Model from EEYorick Peterse2019-03-121-1/+1
| | | | | | | | | | | | | | | This backports the EE changes to Gitlab::Ci::Model back into CE, ensuring the code is the same for both versions.
* | | Merge branch '58739-fix-storage-migration' into 'master'Douglas Barbosa Alexandre2019-03-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix storage migration check for non-empty queues Closes #58739 See merge request gitlab-org/gitlab-ce!26109
| * | | Fix storage migration check for non-empty queuesGabriel Mazetto2019-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | The previous code works fine when running specs, but the API does not exist outside that environment.
* | | | Merge branch ↵Lin Jen-Shin2019-03-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-10421-implement-the-retrieval-reading-of-the-insights-file-to-be-used-in-the-insights-controller' into 'master' New Repository#insights_config method Closes gitlab-ee#10421 See merge request gitlab-org/gitlab-ce!26183
| * | | | New Repository#insights_config methodRémy Coutable2019-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Update acts-as-taggable-on 5.0 -> 6.0Pirate Praveen2019-03-181-0/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '58482-update-airminc/clair-local-scan-to-2.0.6' into 'master'Grzegorz Bizon2019-03-152-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update clair-local-scan to 2.0.6 Closes #58482 See merge request gitlab-org/gitlab-ce!25743
| * | | | Update clair-local-scan to 2.0.6 to support Ubuntu 18.04Takuya Noguchi2019-03-142-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch '56015-remove-remote-timeout' into 'master'Nick Thomas2019-03-151-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove timeout for GitalyClient remove_remote Closes #56015 See merge request gitlab-org/gitlab-ce!26213
| * | | | Remove timeout for GitalyClient remove_remoteMark Chao2019-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This can be slow because it must potentially remove a lot of remote refs (if the remote being removed has a lot of refs)
* | | | | Rename pg_stat_wal_receiver_supported? DB helperAsh McKenzie2019-03-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From pg_stat_wal_receiver_supported? to postgresql_minimum_supported_version? Also add test coverage
* | | | | Merge branch '58208-explicitly-set-masterauth' into 'master'Douglas Barbosa Alexandre2019-03-141-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly set master_auth for new GKE clusters Closes #58208 See merge request gitlab-org/gitlab-ce!26018
| * | | | | Explicitly set master_auth for new GKE clustersThong Kuah2019-03-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From 1.12, GKE will disable basic auth and client certificate by default. Explicitly enable those now (currently we use 1.10/1.11 clusters) so that GKE cluster configuration will continue to work.
* | | | | | Merge branch 'update-rubocop' into 'master'Stan Hu2019-03-1319-248/+196
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rubocop target ruby version See merge request gitlab-org/gitlab-ce!24804
| * | | | | | Run rubocop -aNick Thomas2019-03-1319-248/+196
| |/ / / / /
* | | | | | Merge branch 'fix-review-app-env-url' into 'master'Douwe Maan2019-03-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use project name and ID in Review App environment URLs instead of the project path slug Closes #52990 See merge request gitlab-org/gitlab-ce!25990
| * | | | | | Use project name and id in review app url instead of project path slugwalkafwalka2019-03-121-1/+1
| |/ / / / /
* | | | | | Merge branch 'pravi/gitlab-ce-update-recaptcha' into 'master'Rémy Coutable2019-03-131-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Update recaptcha gem from 3.x to 4.11 See merge request gitlab-org/gitlab-ce!25921
| * | | | | Apply recaptcha API changes in 4.0Toon Claes2019-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In recaptcha 4.0.0 there was an API change: - `public_key` -> `site_key` - `private_key` -> secret_key See: https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md
* | | | | | Merge branch 'allow-filtering-labels-by-a-single-character' into 'master'Robert Speicher2019-03-131-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow filtering labels by a single character Closes #58795 See merge request gitlab-org/gitlab-ce!26012
| * | | | | | Allow filtering labels by a single characterSean McGivern2019-03-131-1/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we use Gitlab::SQL::Pattern, this typically relates to a trigram index. As the 'tri' indicates, we need at least three characters to be able to use that index. Labels don't have a trigram index, because we never allow you to search for them globally: it's always in the context of a project or a group. In that context, it's just as fast to search for a single character (in general) because there is already a pretty specific index being used.
* | | | | | Return early if there were no references in textBob Van Landuyt2019-03-131-5/+2
| | | | | |
* | | | | | Fix 500 error caused by CODEOWNERS with no matchesStan Hu2019-03-121-1/+5
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including a CODEOWNERS file with lines without any matching username or e-mail regular expressions would cause an Error 500. Don't attempt a database query if there is nothing to query. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10282
* | | | | Merge branch 'sh-revert-rack-request-health-checks' into 'master'Douglas Barbosa Alexandre2019-03-122-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix health checks not working behind load balancers Closes #58573 See merge request gitlab-org/gitlab-ce!26055
| * | | | | Fix health checks not working behind load balancersStan Hu2019-03-122-2/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24199 caused requests coming from a load balancer to arrive as 127.0.0.1 instead of the actual IP. `Rack::Request#ip` behaves slightly differently different than `ActionDispatch::Request#remote_ip`: the former will return the first X-Forwarded-For IP if all of the IPs are trusted proxies, while the second one filters out all proxies and falls back to REMOTE_ADDR, which is 127.0.0.1. For now, we can revert back to using `Rack::Request` because these middlewares don't manipulate parameters. The actual fix problem involves fixing Rails: https://github.com/rails/rails/issues/28436. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58573
* | | | | Seed tablesample strategyAndreas Brandl2019-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This produces stable approximate counts among invocations unless the table changed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58791.
* | | | | Merge branch ↵Douglas Barbosa Alexandre2019-03-122-1/+32
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58739-hashed-storage-prevent-a-migration-and-rollback-running-at-the-same-time' into 'master' Hashed Storage: Prevent a migration and rollback running at the same time Closes #58739 See merge request gitlab-org/gitlab-ce!25976
| * | | | Prevent storage migration and rollback running at the same time58739-hashed-storage-prevent-a-migration-and-rollback-running-at-the-same-timeGabriel Mazetto2019-03-122-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a small polishing on the storage migration and storage rollback rake tasks. By aborting a migration while a rollback is already scheduled we want to prevent unexpected consequences.
* | | | | Merge branch 'sh-skip-sti-tables-reltuples' into 'master'Nick Thomas2019-03-122-2/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix counting of groups in admin dashboard Closes gitlab-ee#7435 See merge request gitlab-org/gitlab-ce!26009
| * | | | | Fix counting of groups in admin dashboardStan Hu2019-03-112-2/+26
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Ignore tables that use STI in reltuples count strategy. Models that use Rails' single-type inheritance, such as `Group` and `CiService`, need an additional WHERE clause to count the total properly, which isn't supported by the reltuples strategy. For now, we just omit these from the statistics sampling and rely on the other strategies to get this data. 2. Fix tablesample count strategy not counting groups properly. Models such as `Group` needs a WHERE clause to distinguish it from namespaces. We now add in the WHERE clause if STI is in use. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7435
* | | | | Merge branch 'resolve-lib-differences' into 'master'Robert Speicher2019-03-1215-717/+842
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE to EE differences in the lib/api directory See merge request gitlab-org/gitlab-ce!25430
| * | | | | Add method to API::Variables for filtering paramsYorick Peterse2019-03-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows EE to customize the parameters used in two places, without having to modify the source code directly.
| * | | | | Update Triggers documentation per EEYorick Peterse2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports a line from EE so that both the CE and EE code are identical.
| * | | | | Refactor API::Settings for EEYorick Peterse2019-03-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors API::Settings so that EE can more easily extend its behaviour, without having to modify the CE source code directly.
| * | | | | Move API::Services constants to a helperYorick Peterse2019-03-042-695/+724
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves various constants previously defined in API::Services to the API::Helpers::ServicesHelpers module, using class methods instead of constants. This allows EE to extend the returned values, without having to modify the CE source code directly.
| * | | | | Refactor API::Search for EEYorick Peterse2019-03-042-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors API::Search so that Enterprise Edition can more easily extend its functionality, without having to modify the file directly.
| * | | | | Move eventable types constant to a helperYorick Peterse2019-03-042-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves API::ResourceLabelEventsHelpers::EVENTABLE_TYPES to a class method in a separate helper module, allowing EE to redefine it without having to directly modify the source code.
| * | | | | Move LFS HTTP URL to a separate methodYorick Peterse2019-03-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a method to API::Internal that returns the URL to use for LFS authentication tokens. This makes it possible for EE to redefine this behaviour, without having to directly modify the source code.
| * | | | | Use a method for updating groups in the APIYorick Peterse2019-03-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to creating groups in the groups API, EE injects custom code just before we update an existing group. Moving the update logic to a separate method in CE allows EE to more easily extend it.
View Lorry Controller Status