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-06-21Changes tab VUE refactoringFelipe Artur
2018-06-19Merge branch 'rails5-fix-46276' into 'master'Rémy Coutable
Rails5 fix format in uploads actions Closes #46276 See merge request gitlab-org/gitlab-ce!19907
2018-06-18Rails5 fix format in uploads actionsJasper Maes
2018-06-18Render calendar feed inline when accessed from GitLabImre Farkas
With text/calendar as Content-Type, the browser always downloads the content as a file (even ignoring the Content-Disposition header). We want to display the content inline when accessed from GitLab, similarly to the RSS feed.
2018-06-14Backport InternalRedirect#sanitize_redirectJames Edwards-Jones
2018-06-07Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon
Resolve "Timeout searching group issues" Closes #46648 See merge request gitlab-org/gitlab-ce!19429
2018-06-07Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
2018-06-07Force Postgres to avoid trigram indexes when in a groupSean McGivern
When filtering issues with a search string in a group, we observed on GitLab.com that Postgres was using an inefficient query plan, preferring the (global) trigram indexes on description and title, rather than using a filter on the restricted set of issues within the group. Change the callers of the IssuableFinder to use a CTE in this case to fence the rest of the query from the LIKE filters, so that the optimiser is forced to perform the filter in the order we prefer. This will only force the use of a CTE when: 1. The use_cte_for_search params is truthy. 2. We are using Postgres. 3. We have passed the `search` param. The third item is important - searching issues using the search box does not use the finder in this way, but contructs a query and appends `full_search` to that. For some reason, this query does not suffer from the same issue. Currenly, we only pass this param when filtering issuables (issues or MRs) in a group context.
2018-06-06Simplify issuable finder queriesSean McGivern
We had `item_project_ids` to help make slow queries on the dashboard faster, but this isn't necessary any more - the queries are plenty fast, and we forbid searching the dashboard without filters.
2018-06-05simplify uploader versions checkAlexis Reigel
2018-06-05require uploaded file's name to match in any caseAlexis Reigel
2018-06-05ability to get an image's alternative versionAlexis Reigel
2018-06-05allow uploading favicon in appearance settingsAlexis Reigel
2018-06-01Backport of 5942-extract-ee-specific-filesChantal Rollison
2018-05-31Export assigned issues in iCalendar feedImre Farkas
2018-05-17Resolve "Opening Project with invite but without accepting leads to 404 ↵🙈 jacopo beschi 🙉
error page"
2018-05-14Fix cross-origin errors when attempting to download JavaScript attachmentsStan Hu
If you upload a file with a .js extension, Rails' cross-origin JavaScript protection will prevent a user from downloading the file with a 422 error. Setting the content-type to `text/plain` will allow the user to download the file as a plaintext file. Closes #45826
2018-05-07Merge branch 'ccr/weight_1481' into 'master'Douwe Maan
Backport of 1481-changing-weight-values-should-trigger-system-notes See merge request gitlab-org/gitlab-ce!18699
2018-05-04Reuses `InternalRedirect` when possibleBob Van Landuyt
`InternalRedirect` prevents Open redirect issues by only allowing redirection to paths on the same host. It cleans up any unwanted strings from the path that could point to another host (fe. //about.gitlab.com/hello). While preserving the querystring and fragment of the uri. It is already used by: - `TermsController` - `ContinueParams` - `ImportsController` - `ForksController` - `SessionsController`: Only for verifying the host in CE. EE allows redirecting to a different instance using Geo.
2018-05-04Enforces terms in the web applicationBob Van Landuyt
This enforces the terms in the web application. These cases are specced: - Logging in: When terms are enforced, and a user logs in that has not accepted the terms, they are presented with the screen. They get directed to their customized root path afterwards. - Signing up: After signing up, the first screen the user is presented with the screen to accept the terms. After they accept they are directed to the dashboard. - While a session is active: - For a GET: The user will be directed to the terms page first, after they accept the terms, they will be directed to the page they were going to - For any other request: They are directed to the terms, after they accept the terms, they are directed back to the page they came from to retry the request. Any information entered would be persisted in localstorage and available on the page.
2018-05-03Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison
2018-04-28[Rails5] Use `safe_params` instead of `params` in `url_for` helpersblackst0ne
This commits replaces `params` with `safe_params` in `url_for` helpers to resolve security issues [1] and failing specs with the ``` ArgumentError: Attempting to generate a URL from non-sanitized request parameters! An attacker can inject malicious data into the generated URL, such as changing the host. Whitelist and sanitize passed parameters to be secure. ``` error. [1]: https://gitlab.com/gitlab-org/gitlab-ce/issues/45168
2018-04-24Fix an N+1 for MRs from forks on the MR index pageSean McGivern
2018-04-23Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones
Moves LDAP to its own controller with tests Provides path forward for implementing GroupSaml
2018-04-18Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉
2018-04-16Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon
Embedded Snippets Support Closes #8088 See merge request gitlab-org/gitlab-ce!15695
2018-04-12Merge branch 'dm-archived-read-only' into 'master'Robert Speicher
Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
2018-04-11Support Markdown rendering using multiple projectsYorick Peterse
This refactors the Markdown pipeline so it supports the rendering of multiple documents that may belong to different projects. An example of where this happens is when displaying the event feed of a group. In this case we retrieve events for all projects in the group. Previously we would group events per project and render these chunks separately, but this would result in many SQL queries being executed. By extending the Markdown pipeline to support this out of the box we can drastically reduce the number of SQL queries. To achieve this we introduce a new object to the pipeline: Banzai::RenderContext. This object simply wraps two other objects: an optional Project instance, and an optional User instance. On its own this wouldn't be very helpful, but a RenderContext can also be used to associate HTML documents with specific Project instances. This work is done in Banzai::ObjectRenderer and allows us to reuse as many queries (and results) as possible.
2018-04-11Share collaboration check between view and presenterBob Van Landuyt
2018-04-06[Rails5] Add `raise: false` to skip_before_action in ↵blackst0ne
authenticates_with_two_factor.rb Rails 5.0 raises `ArgumentErrror` if an unrecognised callback is skipped. https://github.com/rails/rails/commit/8b88df94ebda2e829782f514ff51caeaf5e694dd This commit adds `raise: false` to the filter.
2018-04-04[Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne
2018-04-03Refactor discussions/notes codeJan Provaznik
2018-03-22fix the failing specsMicaël Bergeron
2018-03-09Add proxy_download to perform proxied sending of all filesMicaël Bergeron
2018-03-08Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron
2018-03-08Merge branch 'poc-upload-hashing-path' into 'master'Sean McGivern
File uploads on objects storage should use hashed storage Closes #4952 See merge request gitlab-org/gitlab-ee!4597
2018-03-07Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan
Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
2018-03-07Allow maintainers to edit directly in a forkBob Van Landuyt
2018-03-07Merge remote-tracking branch 'dev/master'Robert Speicher
2018-03-07Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan
Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
2018-03-03Bring one group board to CEFelipe Artur
2018-03-02Support additional LabelsFinder parameters for group labelsJan Provaznik
In some situations (listing labels for epics) we want to list only group ancestor labels, this is already supported in LabelsFinder we just need to enable additional parameters. Also `set_issuables_index` method now loads project labels only if @project is set (which is not used for epic group labels).
2018-02-28Merge remote-tracking branch 'origin/master' into ↵Kamil Trzciński
object-storage-ee-to-ce-backport
2018-02-28Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵Kamil Trzciński
object-storage-ee-to-ce-backport
2018-02-28Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński
2018-02-28Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński
This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
2018-02-28Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern
Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
2018-02-28Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵Kamil Trzciński
object-storage-ee-to-ce-backport
2018-02-28Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵Kamil Trzciński
object-storage-ee-to-ce-backport
2018-02-28Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵Kamil Trzciński
object-storage-ee-to-ce-backport