summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support for rendering/redacting multiple documentsrefactor-rendering-redactingYorick Peterse2016-06-2314-33/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the way certain documents are rendered (currently only Notes) and how documents are redacted. Previously both rendering and redacting would run on a per document basis. The result of this was that for every document we'd have to run countless queries just to figure out if we could display a set of links or not. This commit changes things around so that redacting Markdown documents is no longer tied into the html-pipeline Gem. This in turn allows it to redact multiple documents in a single pass, thus reducing the number of queries needed. In turn rendering issue/merge request notes has been adjusted to take advantage of this new setup. Instead of rendering Markdown somewhere deep down in a view the Markdown is rendered and redacted in the controller (taking the current user and all that into account). This has been done in such a way that the "markdown()" helper method can still be used on its own. This particular commit also paves the way for caching rendered HTML on object level. Right now there's an accessor method Note#note_html which is used for setting/getting the rendered HTML. Once we cache HTML on row level we can simply change this field to be a column and call a "save" whenever needed and we're pretty much done.
* Merge branch '18857-new-label-page-needs-work-on-mobile' into 'master' Jacob Schatz2016-06-231-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bottom padding to label color suggestion link ## What does this MR do? Adds a bottom margin to label color suggestions to make sure that when wrapped there is enough whitespace between color rows. ## Are there points in the code the reviewer needs to double check? :confused: ## Why was this MR needed? Mobile UX. ## What are the relevant issue numbers? Closes #18857. ## Screenshots (if relevant) ![Screen_Shot_2016-06-22_at_00.31.26](/uploads/f49c7fa2b97b13e69f0dea97c5dfb319/Screen_Shot_2016-06-22_at_00.31.26.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4845
| * Added bottom padding to label color suggestion link18857-new-label-page-needs-work-on-mobileLuke "Jared" Bennett2016-06-221-0/+1
| |
* | Merge branch 'fix-header-logo' into 'master' Jacob Schatz2016-06-231-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict header logo to 36px so it doesn't overflow. ## What does this MR do? Fixes the logo in the header. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Logos that weren't 36px by 36px were broken in 8.9.0 ## What are the relevant issue numbers? Fixes #18980 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-22_at_1.52.54_PM](/uploads/de6e4d9ccf40b972565e3864173a9907/Screen_Shot_2016-06-22_at_1.52.54_PM.png) After: ![Screen_Shot_2016-06-22_at_1.52.37_PM](/uploads/d72e015263888b5155c1db5e25f54d66/Screen_Shot_2016-06-22_at_1.52.37_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @jschatz1 @dzaporozhets @rspeicher See merge request !4861
| * | Fix header logo width/height issuesJacob Schatz2016-06-231-1/+0
| | |
| * | Restrict header logo to 36px so it doesn't overflow.fix-header-logoConnor Shea2016-06-221-0/+5
| | |
* | | Merge branch 'ruby-23-cache' into 'master' Robert Speicher2016-06-221-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add caching for Ruby 2.3 tests. Accidentally removed when !3807 was merged. See merge request !4868
| * | | Add caching for Ruby 2.3 tests.Connor Shea2016-06-221-0/+5
| | | | | | | | | | | | | | | | Accidentally removed when !3807 was merged.
* | | | Merge branch 'sri' into 'master' Robert Speicher2016-06-222-3/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Subresource Integrity attribute to CSS and JS assets. This prevents compromised or malicious CDNs from modifying GitLab's assets. The hash provided by Rails is compared to the hash of the asset the browser has downloaded. The browser will refuse to execute/parse the assets if the hashes don't match. SRI is currently implemented in Firefox, Chrome, and Opera. This doesn't apply to the dynamically-generated per-page JavaScript due to [a bug in sprockets-rails](https://github.com/rails/sprockets-rails/issues/359). Unfortunately until there's a fix available we won't benefit fully from a security perspective. It's more secure. More information is available in #18230 and on MDN: https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity Fixes #18230 See merge request !4808
| * | | Add clarifying comment and a Changelog entry.Connor Shea2016-06-222-0/+4
| | | |
| * | | Add Subresource Integrity attribute to CSS and JS assets.Connor Shea2016-06-221-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | This prevents compromised or malicious CDNs from modifying assets. The hash provided by Rails is compared to the hash of the asset the browser has downloaded. The browser will refuse to execute/parse the assets if the hashes don't match. SRI is currently implemented in Firefox, Chrome, and Opera. More information is available in #18230 and on MDN: https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity This doesn't apply to the dynamically-generated per-page JavaScript due to a bug in sprockets-rails (https://github.com/rails/sprockets-rails/issues/359).
* | | Merge branch 'fix_saml_signin' into 'master' Robert Speicher2016-06-222-2/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix subsequent SAML sign ins Fixes a bug when `auto_link_ldap_user` is `true` that causes SAML users to be unable to sign in a second time. Fix the problem for https://gitlab.zendesk.com/agent/tickets/22546 See merge request !4718
| * | | Fix subsequent SAML sign insDrew Blessing2016-06-222-2/+18
| | | |
* | | | Merge branch 'fix-external-issue-links' into 'master' Robert Speicher2016-06-222-3/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle external issues in IssueReferenceFilter Handling of external issues was broken when I refactored `IssueReferenceFilter` to use fewer SQL queries. Fixes #18827 See merge request !4789
| * | | | Handle external issues in IssueReferenceFilterfix-external-issue-linksYorick Peterse2016-06-212-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past this class would use Project#get_issue to retrieve an issue by its ID. This method would automatically determine whether to return an Issue or ExternalIssue. This commit changes IssueReferenceFilter to handle external issues again and in a somewhat more explicit manner than before. Fixes gitlab-org/gitlab-ce#18827
* | | | | Merge branch 'fix_upgrade_docs' into 'master' Drew Blessing2016-06-2222-22/+273
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs based on customer upgrade from 4.0 ## What does this MR do? Adds helpful notes to early upgrade docs. Without these helpful hints it will be really hard for most people to upgrade from early versions to later versions. The tip about doing database migrations to version 6.1, then migrating iids, then migrating the database all the way was based on a tip from https://github.com/gitlabhq/gitlabhq/issues/7869. It worked really well! See merge request !4409
| * | | | Update docs based on customer upgrade from 4.0 [ci skip]Drew Blessing2016-06-2222-22/+273
| | |/ / | |/| |
* | | | Merge branch 'inline-todos-docs' into 'master' Robert Speicher2016-06-225-21/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Todos documentation and screenshots to include new functionality. Updates documentation for todos, includes updated and new screenshots. See also !4502 and #18906 Closes #18923 [ci skip] See merge request !4840
| * | | | Finish my sentence. [ci skip]Connor Shea2016-06-221-2/+1
| | | | |
| * | | | Update Todos documentation and screenshots to include new functionality.inline-todos-docsConnor Shea2016-06-215-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about manually creating Todos from issue and merge request sidebars. [ci skip]
* | | | | Merge branch 'dz-version-bump' into 'master' Robert Speicher2016-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Time for 8.10.0-pre See merge request !4852
| * | | | | Time for 8.10.0-prev8.10.0.preDmitriy Zaporozhets2016-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'arrow-nav-bug' into 'master' Jacob Schatz2016-06-223-17/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide nav arrows by default ## What does this MR do? - Fixes the arrow icon flashing on page load - Removes settings dropdown at higher breakpoint - Removes unneeded CSS Closes #18941 ## Screenshots (if relevant) Arrow flashing bug: ![icon](/uploads/3db95626acd0adb37438bdbc2c4aa154/icon.gif) Settings dropdown breaking nav: <img src="/uploads/4351035f4cf8cb9fd892b621e6339e50/Screen_Shot_2016-06-21_at_4.25.50_PM.png" width="800px"> @alfredo1 would you mind double checking this to make sure the arrow flashing is definitely not happening? See merge request !4843
| * | | | | Hide nav arrows by default; remove settings dropdown btn at larger ↵arrow-nav-bugAnnabel Dunstone2016-06-213-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | breakpoint; remove unneccessary CSS
* | | | | | Fix CHANGELOGRémy Coutable2016-06-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'doc_refactor_labels' into 'master' Achilleas Pipinellis2016-06-2220-18/+150
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor labels docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18555 See merge request !3347
| * | | | | | Refactor labels documentationAchilleas Pipinellis2016-06-2214-26/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new images to match the new UI - Document the new prioritize feature
| * | | | | | Move labels documentation to new locationdoc_refactor_labelsAchilleas Pipinellis2016-06-2118-117/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
| * | | | | | Add info on tooltipsAchilleas Pipinellis2016-06-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Refactor labels docsAchilleas Pipinellis2016-06-2112-9/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'expiry' into 'master' Achilleas Pipinellis2016-06-221-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify artifact expiry ## What does this MR do? Clarifies documentation about artifact expiry. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !4831
| * | | | | | | Clarify artifact expiryexpiryMark Pundsack2016-06-211-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'ci-git' into 'master' Achilleas Pipinellis2016-06-221-23/+80
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document `GIT_STRATEGY` and `GIT_DEPTH` ## What does this MR do? Documents `GIT_STRATEGY` and `GIT_DEPTH`. Also fixes the TOC since the anchors weren't working. ## Are there points in the code the reviewer needs to double check? The TOC and the location of the new entries. ## Why was this MR needed? ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188 ## Screenshots (if relevant) ![image](/uploads/eccfd60199d81e6588c13aab817f0eb5/image.png) ![image](/uploads/bbbffe61db64ef17f1fa52907275f3d4/image.png) /cc @axil @ayufan See merge request !4720
| * | | | | | | | Update GIT_DEPTH wordingci-gitMark Pundsack2016-06-171-8/+26
| | | | | | | | |
| * | | | | | | | Clean up TOCMark Pundsack2016-06-171-23/+23
| | | | | | | | |
| * | | | | | | | Add to TOCMark Pundsack2016-06-171-0/+2
| | | | | | | | |
| * | | | | | | | Add GIT_STRATEGY and GIT_DEPTHMark Pundsack2016-06-171-0/+37
| | | | | | | | |
* | | | | | | | | Merge branch '18855-wrap-code-in-activities-and-todos' into 'master' Dmitriy Zaporozhets2016-06-223-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap code blocks on Activies and Todos page ## What does this MR do? wrap code blocks on Activities and Todos page ## Are there points in the code the reviewer needs to double check? Can `white-space: pre-wrap` be used for code blocks everywhere? ## Why was this MR needed? Content of code blocks is cut on small screen sizes. ## What are the relevant issue numbers? closes #18855 ## Screenshots ![activities-code](/uploads/83eb5100dbcc34ade8892e9f68bf767f/activities-code.png) ![todos-code](/uploads/80efbf4875c9f5db1f1a3790fc8afa3b/todos-code.png) See merge request !4783
| * | | | | | | | | wrap code blocks on Activies and Todos pagewinniehell2016-06-203-0/+9
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'feature/import-export-docs' into 'master' Achilleas Pipinellis2016-06-2210-1/+121
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import/export docs Added documentation for and closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3050 Also added a couple of rake tasks that might be useful. See merge request !4732
| * \ \ \ \ \ \ \ \ Merge branch 'master' into feature/import-export-docsAchilleas Pipinellis2016-06-2299-745/+826
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Give images proper namesAchilleas Pipinellis2016-06-226-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Add note about the shared directoryAchilleas Pipinellis2016-06-222-2/+8
| | | | | | | | | | |
| * | | | | | | | | | Add colons in item listsAchilleas Pipinellis2016-06-221-7/+8
| | | | | | | | | | |
| * | | | | | | | | | Add note about enabling import/export in existing installationsAchilleas Pipinellis2016-06-222-2/+6
| | | | | | | | | | |
| * | | | | | | | | | Remove old docAchilleas Pipinellis2016-06-221-65/+0
| | | | | | | | | | |
| * | | | | | | | | | Add note about settingsfeature/import-export-docsJames Lopez2016-06-221-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Refactor project import/export documentationAchilleas Pipinellis2016-06-213-38/+66
| | | | | | | | | | |
| * | | | | | | | | | Move to new locationAchilleas Pipinellis2016-06-217-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
| * | | | | | | | | | updated based on feedbackJames Lopez2016-06-211-5/+3
| | | | | | | | | | |