Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-01Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern
2018-11-01Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis
Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
2018-11-01Fix typos in comments and specsGeorge Tsiolis
2018-11-01Fix testsHeinrich Lee Yu
2018-11-01Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu
2018-10-31Merge branch 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre
Remove EE-specific code from 'Discussion' models See merge request gitlab-org/gitlab-ce!22687
2018-10-30Allow FoundBlob to access language from gitattributesMark Chao
Extract language_from_git_attributes as a concern so it can ben included in two blob classes.
2018-10-30Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney
2018-10-29Merge branch 'security-redact-links' into 'master'Jan Provaznik
[master] Redact unsubscribe links in issuable texts See merge request gitlab/gitlabhq!2528
2018-10-29[master] Persist only SHA digest of PersonalAccessToken#tokenImre Farkas
2018-10-29Associate clusters model to groupsThong Kuah
Even though we currently only should have one group for a cluster, we allow the flexibility to associate to other groups in the future. This also matches the runner <=> groups association. - Adds Cluster#first_group, aliased to Cluster#group. For the conceivable future, a cluster will have at most one group. - Prevent mixing of group and project clusters. If project type clusters, it should only have projects assigned. Similarly with groups. - Default cluster_type to :project_type. As it's very small table we can set default and null: false in one release.
2018-10-26Remove EE-specific code from DiscussionNoteSean McGivern
2018-10-23Redact unsubscribe links in issuable textsJan Provaznik
It's possible that user pastes accidentally also unsubscribe link which is included in footer of notification emails. This unsubscribe link contains personal token which attacker then use to act as the original user (e.g. for sending comments under his/her identity).
2018-10-19Add preload in issues controllerChantal Rollison
2018-10-13Remove dependencies on LinguistZeger-Jan van de Weg
This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
2018-10-05Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda
2018-10-05Merge branch 'ce-issue_1984' into 'master'Sean McGivern
Backport CE changes from draft_notes addition in EE See merge request gitlab-org/gitlab-ce!22125
2018-10-05Merge branch '51748-filter-any-milestone-via-api' into 'master'Douwe Maan
Allows to filter issues by `Any milestone` in the API Closes #51748 See merge request gitlab-org/gitlab-ce!22080
2018-10-05Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda
2018-10-05Backport CE changes from draft_notes addition in EEMario de la Ossa
2018-10-04Fix N+1 for notification recipients in subscribersSean McGivern
2018-10-03Allows to filter issues by `Any milestone` in the APIJacopo
In GET `api/v4/projects/:id/issues` the user can filter issues that have an assigned milestone through the parameter `milestone=Any+Milestone`.
2018-10-02Change the order of status_sql to avoid the query for scheduled status at ↵Shinya Maeda
the earlier step
2018-10-02Optimize query formatShinya Maeda
2018-10-02Fix spec. Create scheduled status entry for pipelineShinya Maeda
2018-10-02Update pipelines and stages status as wellShinya Maeda
2018-10-02Add a new status to ci_builds.statusShinya Maeda
2018-10-02Squashed commit of the following:Shinya Maeda
commit 9d9594ba20097dc4598f7eb42a9f9d78d73eae54 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Sep 13 20:18:31 2018 +0900 Cancel scheduled jobs commit f31c7172e07a9eb03b58c1e62eaa18cda4064aa6 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Sep 13 11:18:42 2018 +0900 Add Ci::BuildSchedule commit fb6b3ca638f40f9e1ee38b1fdd892bda4f6fede7 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Sep 12 20:02:50 2018 +0900 Scheduled jobs
2018-10-02Improve logging when username update fails due to registry tagsStan Hu
When a user cannot be renamed due to existing container registry tags, log the namespace and an example project that has tags.
2018-09-24Use `Gitlab::SafeRequestStore` in more placesMichael Kozono
Even if it doesn’t save lines of code, since people will tend to use code they’ve seen. And `SafeRequestStore` is safer since you don’t have to remember to check `RequestStore.active?`.
2018-09-24Simplify by using Gitlab::SafeRequestStoreMichael Kozono
These are clear wins.
2018-09-18Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher
Remove EE-specific lines from Plan concerns See merge request gitlab-org/gitlab-ce!21448
2018-09-17Fix bad conflicts resolutionLin Jen-Shin
2018-09-17Remove EE-specific code from ProtectedRefAccessSean McGivern
2018-09-17Remove EE-specific code from MentionableSean McGivern
2018-09-17Remove EE-specific code from IssuableSean McGivern
2018-09-17Added FromUnion to easily select from a UNIONYorick Peterse
This commit adds the module `FromUnion`, which provides the class method `from_union`. This simplifies the process of selecting data from the result of a UNION, and reduces the likelihood of making mistakes. As a result, instead of this: union = Gitlab::SQL::Union.new([foo, bar]) Foo.from("(#{union.to_sql}) #{Foo.table_name}") We can now write this instead: Foo.from_union([foo, bar]) This commit also includes some changes to make this new setup work properly. For example, a bug in Rails 4 (https://github.com/rails/rails/issues/24193) would break the use of `from("sub-query-here").includes(:relation)` in certain cases. There was also a CI query which appeared to repeat a lot of conditions from an outer query on an inner query, which isn't necessary. Finally, we include a RuboCop cop to ensure developers use this new module, instead of using Gitlab::SQL::Union directly. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
2018-09-14Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher
CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
2018-09-11Fix how we use EE::ProtectedRefAccessLin Jen-Shin
This is a mess... Using prepend will give a different ancestors chain we're not expecting. To fix this we'll need to know what exactly methods we want to use in each classes using this module.
2018-09-11Enable frozen string in vestigial filesgfyoung
Partially addresses #47424.
2018-09-07Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'Douwe Maan
Resolve "Remove old storage logic from Import/Export" Closes #51144, #50109, #48778, and #51079 See merge request gitlab-org/gitlab-ce!21409
2018-09-07Use ResourceLabelEvent for tracking label changesJan Provaznik
2018-09-07Merge branch 'issue_50488' into 'master'Stan Hu
Move project services log to a separate file See merge request gitlab-org/gitlab-ce!21316
2018-09-06Move project services log to a separate fileFelipe Artur
2018-09-06Resolve "Migrate issue labels and milestone to related merge request"Tiago Botelho
2018-09-06Refactor code to remove object storage flag from Import/ExportJames Lopez
Updated docs, refactor import/export code Fix AvatarUploader path issue Fix project export upload webhook error
2018-09-06Merge branch 'bvl-codeowners-file-ce' into 'master'Douwe Maan
Port changes for CODEOWNERS to CE See merge request gitlab-org/gitlab-ce!21309
2018-09-06Port changes for CODEOWNERS to CEBob Van Landuyt
This ports the changes for the CODEOWNERS feature to CE: - It adds the CODEOWNERS file. - It adds the mention of the `with-codeowners` branch in TestEnv
2018-09-05Merge branch 'filter-web-hooks-by-branch' into 'master'Dmitriy Zaporozhets
Filter web hooks by branch See merge request gitlab-org/gitlab-ce!19513
2018-09-05Refactor: move active hook filter to TriggerableHooksDuana Saskia