summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add #18019 to the CHANGELOG.18019-fix-wiki-linkingTimothy Andrew2016-06-091-0/+1
|
* Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-098-9/+15
| | | | | | | | | - 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
* Implement the correct linking behaviour in `WikiLinkFilter`.Timothy Andrew2016-06-095-112/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original Comments ================= - Linking behaves as per rules documented here: https://gitlab.com/gitlab-org/gitlab-ce/blob/16568-document-wiki-linking-behavior/doc/markdown/wiki.md - All links (to other wiki pages) are rewritten to be at the level of the app root. We can't use links relative to the current page ('./foo', 'foo', '../foo'), because they won't work in the markdown preview, where the current page is suffixed with `/edit` - Move existing `WikiLinkFilter` specs to `WikiPipeline` spec. It makes sense to run these tests on the combined output of the pipeline, rather than a single filter, since we can catch issues with conflicting filters. - Add more tests to cover the new linking @rymai's Review =============== - Classes nested under `WikiLinkFilter` should declare `WikiLinkFilter`'s inherit, so nothing changes if the nested class is loaded first. - Add a blank line after a guard clause - Use keyword arguments for the `Rewriter` constructor - Invert a condition - use `if` instead of `unless` - Inline a `let` in `WikiPipeline` spec - it was only used in a single place - Change out of date spec names - Add a comment for every rewrite rule in `Rewriter`
* Merge branch 'cs-unnecessary-assets' into 'master' Robert Speicher2016-06-0216-8/+39
|\ | | | | | | | | | | | | | | | | | | | | Load d3 only when necessary Now d3 is only loaded on the users' show page and the graphs pages, where it's necessary. Redo of !3993. This decreases page size from 4.6MB to 4.3MB for a given Activity page (before compression), or a savings of 300KB. This is essentially a proof of concept for removing larger dependencies such as the Ace Editor, Chart.js, and Raphael, which will likely provide another 1MB of savings on most pages (again, before compression). See merge request !4394
| * Move JS graph specs to match assets tree.Connor Shea2016-06-013-0/+0
| |
| * Fix teaspoonConnor Shea2016-06-013-3/+3
| |
| * Fix indentationConnor Shea2016-06-011-6/+6
| |
| * Attempt to fix the user page.Connor Shea2016-06-0110-2/+12
| |
| * Remove d3 except for on pages where it's necessary.Connor Shea2016-06-0110-5/+26
| |
* | Merge branch 'cleanup-readme' into 'master' Robert Speicher2016-06-021-2/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | Remove Coveralls and Semaphore badges. [ci skip] Remove Coveralls and Semaphore badges from the README. They're outdated, unused, and not GitLab CI :) [ci skip] See merge request !4334
| * Remove Coveralls and Semaphore badges. [ci skip]cleanup-readmeConnor Shea2016-05-311-2/+0
| |
* | Merge branch 'fix-dropdown-cutoff' into 'master' Robert Speicher2016-06-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Adds a `title` attribute to the branch dropdown for when the name has been cut off. Fixes #18056 See merge request !4395
| * | Add a title attribute to each branch in the branches dropdown on the New MR ↵Connor Shea2016-05-311-1/+1
| | | | | | | | | | | | page.
* | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-0210-31/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade devise, devise-two-factor, and attr_encrypted Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support. attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future. See merge request !4216
| * | | Fix a broken specConnor Shea2016-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | Temporary fix until Devise 4 fixes this grammar issue: https://github.com/plataformatec/devise/issues/4095
| * | | Upgrade attr_encrypted and encryptorConnor Shea2016-05-307-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr_encrypted (1.3.4 => 3.0.1) Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.m d attr_encrypted 2.x included a vulnerability, so that major version is skipped. 3.x requires that the algorithm and mode used by each encrypted attribute is specified explicitly. `nil` is no longer a valid value for the encrypted_value_iv field, so it’s changed to a randomly generated string.
| * | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-305-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devise (3.5.4 => 4.1.1) Changelog: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md devise-two-factor (2.0.1 => 3.0.0) Changelog: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md These are reliant on each other, so they have to be upgraded together. devise-async is no longer necessary as Devise 4.1 fixes a bug with the ActiveJob integration.
* | | | Merge branch 'downcase-registry-repository' into 'master' Stan Hu2016-06-013-3/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use downcased path to container repository as this is expected path by Docker ## What does this MR do? Docker Engine requires path to be lowercase. This makes all container registry paths to be show and used downcased instead of mixed case. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17959 See merge request !4420
| * | | | Introduce container_registry_path_with_namespacedowncase-registry-repositoryKamil Trzcinski2016-06-012-17/+16
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into downcase-registry-repositoryKamil Trzcinski2016-06-013-4/+28
| |\ \ \ \
| * | | | | Use downcased path to container repository as this is expected path by DockerKamil Trzcinski2016-06-013-3/+18
| | | | | |
* | | | | | Merge branch '17187-hover-row' into 'master' Jacob Schatz2016-06-012-4/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new row hover style ## What does this MR do? Implement new row hover style ## What are the relevant issue numbers? Closes #17187 ## Screenshots (if relevant) ![Screen_Shot_2016-06-01_at_1.40.04_PM](/uploads/62db01f405db50531fb648e46dc9598a/Screen_Shot_2016-06-01_at_1.40.04_PM.png) cc @dzaporozhets See merge request !4422
| * | | | | Implement new row hover styleAnnabel Dunstone2016-06-012-4/+12
| | | | | |
* | | | | | Merge branch '17676-merge-request-widget-alignment' into 'master' Jacob Schatz2016-06-011-1/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR widget mobile styling ## What does this MR do? Corrects MR widget styling for mobile viewing. ## Are there points in the code the reviewer needs to double check? I have tested all MR states. ## Why was this MR needed? UX. ## What are the relevant issue numbers? Closes #17676. ## Screenshots (if relevant) ![Screen_Shot_2016-05-31_at_20.04.02](/uploads/b1bc67b1015b2e771ae1b1364b225618/Screen_Shot_2016-05-31_at_20.04.02.png)![Screen_Shot_2016-05-31_at_20.03.50](/uploads/86a552c0d27d6f53cdf1b94631b26449/Screen_Shot_2016-05-31_at_20.03.50.png)![Screen_Shot_2016-05-31_at_20.03.34](/uploads/a5b9e7b634e974095922df9194d493b5/Screen_Shot_2016-05-31_at_20.03.34.png)![Screen_Shot_2016-05-31_at_20.01.35](/uploads/2fc5d49e3c1f2ff2cb324e9527179066/Screen_Shot_2016-05-31_at_20.01.35.png)![Screen_Shot_2016-05-31_at_20.00.25](/uploads/23af913891ff941dc5231872b3c6f177/Screen_Shot_2016-05-31_at_20.00.25.png)![Screen_Shot_2016-05-31_at_19.59.53](/uploads/8abb72609409ba7ca02ad6b35787c15c/Screen_Shot_2016-05-31_at_19.59.53.png)![Screen_Shot_2016-05-31_at_19.58.31](/uploads/fabf1c6c135f5e736614e568fc4cfb53/Screen_Shot_2016-05-31_at_19.58.31.png)![Screen_Shot_2016-05-31_at_19.58.51](/uploads/967a578a34cb3a9dd3723c2f22ce89c4/Screen_Shot_2016-05-31_at_19.58.51.png)![Screen_Shot_2016-05-31_at_23.33.19](/uploads/841af7a90bb3fc3c74a2e51b64fc444f/Screen_Shot_2016-05-31_at_23.33.19.png)![Screen_Shot_2016-05-31_at_23.33.23](/uploads/183fb8407c271d9aa3fefea5d8201238/Screen_Shot_2016-05-31_at_23.33.23.png) See merge request !4386
| * | | | | Fix MR widget mobile stylingLuke "Jared" Bennett2016-05-311-1/+24
| | | | | |
* | | | | | Merge branch 'fix-note-validation-failure' into 'master' Stan Hu2016-06-012-3/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note validation spec failure Fix failing build due to project of note not matching issue project. See merge request !4415
| * | | | | Fix note validation spec failuresStan Hu2016-06-012-3/+4
| | | | | |
* | | | | | Merge branch 'add-edge-support' into 'master' Jacob Schatz2016-06-011-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Edge to supported browsers list. Add Microsoft's Edge browser to the list of supported browsers. We support the latest stable version. See merge request !4416
| * | | | | | Add Edge to supported browsers list. [ci skip]Connor Shea2016-06-011-0/+1
| | | | | | |
* | | | | | | Merge branch 'dont-advertise-ci-skip' into 'master' Robert Speicher2016-06-011-4/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't advertise the use of "ci skip" in the CONTRIBUTING guide [ci skip] See merge request !4406
| * | | | | | Don't advertise the use of "ci skip" in the CONTRIBUTING guidedont-advertise-ci-skipRémy Coutable2016-06-011-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we autoscale runner, we don't need to optimize for their usage anymore. Abusing of "ci skip", for instance for view changes can lead to broken specs, so let's just not use it! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'style/enable-semicolon-rubocop-cop' into 'master' Robert Speicher2016-06-013-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/Semicolon rubocop style cop Don't use semicolons to terminate expressions. See #17478. See merge request !4351
| * | | | | | | Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-copGrzegorz Bizon2016-06-013-3/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | See #17478
* | | | | | | Merge branch 'rubocop/enable-style-for-cop' into 'master' Robert Speicher2016-06-012-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/For rubocop cop > Do not use `for`, unless you know exactly why. Most of the time iterators should be used instead. `for` is implemented in terms of `each` (so you're adding a level of indirection), but with a twist - `for` doesn't introduce a new scope (unlike `each`) and variables defined in its block will be visible outside it. See #17478 See merge request !4397
| * | | | | | | Enable Style/For rubocop coprubocop/enable-style-for-copGrzegorz Bizon2016-06-012-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use for, unless you know exactly why. See #17478
* | | | | | | Merge branch 'dz-one-ci-cd-tab' into 'master' Dmitriy Zaporozhets2016-06-014-9/+22
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Builds and Pipelines tab into one Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4053#note_12064642. Main idea is to keep all CI-related pages under one tab. So we can keep top navigation clean. First I tried `CI/CD` naming but it looked weird so I just used Pipelines as tab name. I did not change project settings naming. cc @ayufan @markpundsack @jschatz1 See merge request !4340
| * | | | | | Merge Builds and Pipelines tab into onedz-one-ci-cd-tabDmitriy Zaporozhets2016-05-284-9/+22
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-0193-616/+2133
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Refactor ParticipableYorick Peterse2016-06-0116-66/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several changes to this module: 1. The use of an explicit stack in Participable#participants 2. Proc behaviour has been changed 3. Batch permissions checking == Explicit Stack Participable#participants no longer uses recursion to process "self" and all child objects, instead it uses an Array and processes objects in breadth-first order. This allows us to for example create a single Gitlab::ReferenceExtractor instance and pass this to any Procs. Re-using a ReferenceExtractor removes the need for running potentially many SQL queries every time a Proc is called on a new object. == Proc Behaviour Changed Previously a Proc in Participable was expected to return an Array of User instances. This has been changed and instead it's now expected that a Proc modifies the Gitlab::ReferenceExtractor passed to it. The return value of the Proc is ignored. == Permissions Checking The method Participable#participants uses Ability.users_that_can_read_project to check if the returned users have access to the project of "self" _without_ running multiple SQL queries for every user.
| * | | | | | Refactor MentionableYorick Peterse2016-05-261-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caching is now always enabled when rendering attributes as there's no reason to not cache them. The method Mentionable#all_references has also been modified to take an optional Gitlab::ReferenceExtractor instance to allow other code to create one and re-use it between multiple calls.
| * | | | | | Added author to various Markdown calls in viewsYorick Peterse2016-05-2621-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures all these calls have an author set, allowing the use of "all" mentions where possible.
| * | | | | | Split Markdown rendering & reference gatheringYorick Peterse2016-05-2652-515/+1527
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Added Gitlab::LazyYorick Peterse2016-05-262-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class can be used to lazy-evaluate blocks of code the first time they're called. This can be useful when a method performs a certain heavy operation (e.g. a SQL query) that you only want to perform whenever the result is used for the first time.
| * | | | | | Don't modify arguments in CommitRange#initializeYorick Peterse2016-05-262-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method used to call strip! on input strings which will mess with the strings if they're re-used or frozen.
* | | | | | | Merge branch 'fix-cancelable-retryable' into 'master' Douwe Maan2016-06-014-2/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cancelability and retriablity of pipeline with generic statuses Currently it's not possible to cancel or retry generic status since this is external thing to GitLab. This fixes shown actions of pipelines containing only these actions. See merge request !4380
| * | | | | | | Fix rubocop offensesfix-cancelable-retryableKamil Trzcinski2016-06-011-2/+2
| | | | | | | |
| * | | | | | | Test cancelability and retriablity of pipeline for generic statusesKamil Trzcinski2016-05-311-0/+30
| | | | | | | |
| * | | | | | | Pipelines can be canceled only when there are running buildsKamil Trzcinski2016-05-313-2/+7
| | | | | | | |
* | | | | | | | Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master' Rémy Coutable2016-06-013-8/+67
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use project that belongs to pipeline in view ## What does this MR do? This MR makes project in pipelines view match the one that pipeline has been created for. Closes #17943 See merge request !4376
| * | | | | | | | Add Changelog entry for links fix on pipeline pagefix/error-500-in-pipeline-when-forkGrzegorz Bizon2016-06-011-0/+1
| | | | | | | | |