| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added user avatar to header
## What does this MR do?
Adds the users avatar to the header with a dropdown for profile & sign out.
## What are the relevant issue numbers?
Closes #18543
## Screenshots (if relevant)
See merge request !4939
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
is published
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
This reverts commit b435d7405364d28ec364072f4437512da2876762.
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| | |
feature/project-export
# Conflicts:
# app/models/ci/pipeline.rb
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
mark
Here was the problem:
1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
2. If the blob is text, GitLab will attempt to display it.
3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.
To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
an update to gitlab_git: gitlab-org/gitlab_git!86
Closes #13826
|
| | |
| |
| |
| | |
This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
|
| | | |
|
| |\ \
| |/
| |
| | |
gitlab.com:gitlab-org/gitlab-ce into feature/project-export
|
| | |\
| | |
| | |
| | |
| | | |
Make Omniauth providers specs to not modify global configuration
See merge request !4534
|
| | | | |
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix wiki linking behavior for markdown wiki pages
Related to #18019
- As per the documentation in !4372
## TODO
- [ ] !4432 Have wiki linking behave as per the documentation
- [x] Move `WikiLinkFilter` specs to the pipeline level
- [x] Verify current behavior on wiki `show` page
- [x] Fix current behavior on wiki `show` page
- [x] Verify current behaviour on wiki preview
- [x] Fix current behaviour on wiki preview
- [x] Rewrite all links and get preview links working
- [x] Make sure all links are on-par with the wiki `show` page
- [x] TDD `WikiLinkFilter` and get it working
- [x] Hook `WikiLinkFilter` up
- [x] Fix tests
- [x] Fix `markdown_spec`
- [x] Fix `wiki` spinach feature
- [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass
- [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.)
- [x] Test in different ruby versions
- [x] GitLab instances hosted on a relative URL
- [x] Non-markdown rendering formats?
- [x] RDoc
- [x] ASCIIDoc
- [x] Create issues to fix things for RDoc and ASCIIDoc
- [x] Gauge performance impact
- [x] Refactor
- [x] Re-organize commits
- [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes
- [x] Respond to @rymai's comments
- [x] `class WikiLinkFilter < HTML::Pipeline::Filter`
- [x] blank line after guard clause
- [x] keyword arguments for `wiki` and `slug`
- [x] invert the condition
- [x] inline `user` in spec
- [x] Make sure spec names are not out of date
- [x] Comment for each rewrite rule
- [x] Add CHANGELOG entry
- [x] Reorganize commits
- [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes
- [ ] Wait for merge
See merge request !4432
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Need to pass in a `page_slug` to the filter, so it can rewrite based
on the current page (all links are rewritten to the level of the app root).
- The earlier `markdown_preview` endpoint was at the level of the wiki.
We need to know the current page (for rewriting, as above), so this
commit moves the endpoint to the level of a wiki page.
- Fix all tests
|
| | |\ \ |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
# Conflicts:
# spec/features/builds_spec.rb
|
| | | | |/ |
|
| | |/ / |
|
| | |/ |
|
| |\ \
| |/ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Separate reference gathering from rendering
This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.
cc @rspeicher @DouweM
See merge request !3969
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This splits the Markdown rendering and reference extraction phases into
two distinct code bases. The reference extraction phase no longer relies
on the html-pipeline Gem (and any related code) and allows for
extracting of references from multiple HTML nodes in a single pass. This
means that if you want to extract user references from 200 comments you
no longer need to run 200 times N number of queries, instead only a
handful of queries may be needed.
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.
Closes #18000
|
| | |\
| | |
| | |
| | |
| | | |
# Conflicts:
# app/services/system_note_service.rb
|
| | | |
| | |
| | |
| | | |
Gitlab::Diff::InlineDiff
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
eReGeBe/gitlab-ce-feature/milestone-md
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | | | | |
|
| | | | | |
|
| | | |\ \
| | | |/ |
|
| | | | | |
|
| | | |/ |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Using the syntax proposed in #13829 [project_reference]%(milestone_id | milestone_name)
to get a link to the referred milestone.
|
| | | |
| | |
| | |
| | | |
This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.
|
| | | |
| | |
| | |
| | |
| | | |
# Conflicts:
# app/models/project.rb
|
| | | | |
|
| |\ \ \
| | |/
| |/|
| | | |
gitlab.com:gitlab-org/gitlab-ce into feature/project-export
|
| | |/
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \
| |/
| |
| | |
feature/project-export
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | | |
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
|
| | | |
| | |
| | |
| | |
| | | |
Code is based on Project Webhooks, removing deprecations and without
commits listing.
|
| | |/ |
|
| |\ \
| |/
| |
| | |
feature/project-export
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Wiki preview URL converting problem [via Markdown]
Current implementation when rendering the preview, thinks relative links are for project repository files.
We are creating a new preview route that will define correct context data to render for wikis instead.
Fixes #2380, #1184
See merge request !3461
|
| | | | |
|
