summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add minor improvements in readability in CI configrefactor/ci-config-move-global-entriesGrzegorz Bizon2016-07-043-4/+3
|
* Improve description of CI types node and in specsGrzegorz Bizon2016-06-301-2/+2
|
* Add global cache config entry to new CI configGrzegorz Bizon2016-06-2911-30/+45
|
* Add CI config entry location info to error messageGrzegorz Bizon2016-06-292-7/+6
| | | | This CI config entry location in configuration Hash.
* Make it possible to set parent in CI config nodeGrzegorz Bizon2016-06-291-2/+14
|
* Merge branch 'master' into refactor/ci-config-move-global-entriesGrzegorz Bizon2016-06-2814-308/+608
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (352 commits) Display last commit of deleted branch in push events (!4699) add changelog add missing attribute to attr_encrypted so it is fully backwards-compatible Add "GitLab team members only" to diagram link doc: note that .gitattributes uses default branch use the conf lexer so we have highlighted comments first draft of docs support cgi style options, such as erb?parent=json move the path alias to a more appropriate location make #custom_language private appease rubocop add an alias for Snippet#path appease rubocop check the tag so that an instance will pass too fix the spec, using project.change_head Revert "bump the master sha for gitlab-test!9" bump the master sha for gitlab-test!9 add custom highlighting via .gitattributes Rename Licenses API to License Templates API Check for conflict with wiki projects when creating a new project. ...
| * support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-271-3/+14
| |
| * appease rubocophttp://jneen.net/2016-06-271-2/+2
| |
| * check the tag so that an instance will pass toohttp://jneen.net/2016-06-271-1/+1
| |
| * fix the spec, using project.change_headhttp://jneen.net/2016-06-271-3/+9
| |
| * add custom highlighting via .gitattributeshttp://jneen.net/2016-06-271-0/+10
| | | | | | | | paired with @stanhu
| * Merge branch 'image-sizing' into 'master' Rémy Coutable2016-06-271-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image sizing ## What does this MR do? Limits image height to fit the screen. The wrapping div is so the image is guaranteed to be a block element without the link area growing to be larger than the image itself. ## Are there points in the code the reviewer needs to double check? Make sure this can't be done in a more performant or concise way with Banzai. ## Why was this MR needed? Images were displayed at their full resolution, which made it difficult to read issues when the image height was greater than the viewport height (see #18861). ## What are the relevant issue numbers? Fixes #18861. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-20_at_3.25.26_PM](/uploads/158424375ade95adcd337ccd34c48747/Screen_Shot_2016-06-20_at_3.25.26_PM.png) After: ![Screen_Shot_2016-06-20_at_3.24.57_PM](/uploads/f1a3b5f6442e4e3b1067332a547fb1c8/Screen_Shot_2016-06-20_at_3.24.57_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] Tests - [x] Added for this feature/bug - [x] 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) cc: @jschatz1 @dzaporozhets @rspeicher See merge request !4810
| | * Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-271-0/+5
| | | | | | | | | | | | | | | | | | Add max-height to prevent images from displaying larger than the provided screen size. Also fix a failing test and add a new one.
| * | Merge branch 'test-gitlab-ci-ymls' into 'master' Rémy Coutable2016-06-271-0/+12
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test templates and GitLabCI parser againts each other ## What does this MR do? Test the available templates against the preprocessor and vice versa ## Are there points in the code the reviewer needs to double check? The dynamic creation of tests seems a little hacked. Is there a cleaner way? ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added -- Seems unneeded - [x] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) See merge request !4898
| | * Test templates and GitLabCI parser againts each othertest-gitlab-ci-ymlsZ.J. van de Weg2016-06-271-0/+12
| | |
| * | Merge branch 'refactor/ci-config-add-entry-error' into 'master' Rémy Coutable2016-06-278-19/+158
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve validations and error handling in new CI config entries ## What does this MR do? This MR improves validation in new CI config. ## Why was this MR needed? With that it will be easier to handle errors during validation and post-processing. ## What are the relevant issue numbers? This is a continuation of #15060 See merge request !4560
| * | | Support for rendering/redacting multiple documentsYorick Peterse2016-06-243-0/+198
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix/import-export-gitlab-errors' into 'master' Rémy Coutable2016-06-232-0/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix errors found on importing GitLab CE repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18968 See merge request !4855
| | * | fixed pipeline notes issueJames Lopez2016-06-232-0/+29
| | | |
| * | | Add Sidekiq queue duration to transaction metrics.Paco Guzman2016-06-231-1/+16
| |/ /
| * | Merge branch 'fix_saml_signin' into 'master' Robert Speicher2016-06-221-1/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-1/+17
| | | |
| * | | Merge branch 'fix-external-issue-links' into 'master' Robert Speicher2016-06-221-0/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-0/+36
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-211-5/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Optimize Banzai::Filter::RelativeLinkFilter See merge request !4813
| | * | | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-5/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of git operations were being repeated, for example, to build a url you would ask if the path was a Tree, which would call a recursive routine in Gitlab::Git::Tree#where, then ask if the path was a Blob, which would call a recursive routine at Gitlab::Git::Blob#find, making reference to the same git objects several times. Now we call Rugged::Tree#path, which allows us to determine the type of the path in one pass. Some other minor improvement added, like saving commonly used references instead of calculating them each time.
| * | | Merge branch 'ci-lfs-fetch' into 'master' Rémy Coutable2016-06-211-298/+263
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to fetch LFS from CI ## What does this MR do? This adds support for fetching LFS object from CI jobs (mostly it's made for supporting GitLab CI). ## What is left? - [x] Write tests covering a new authorization mechanism cc @grzesiek @marin See merge request !4465
| | * | | Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-211-289/+240
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-2134-107/+6806
| | |\ \ \ | | | |/ /
| | * | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-1021-323/+470
| | |\ \ \
| | * | | | WIPKamil Trzcinski2016-06-031-11/+25
| | | | | |
| * | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-201-3/+3
| | |_|/ / | |/| | |
* | | | | Validate interface only with CI node validatorGrzegorz Bizon2016-06-271-25/+7
| | | | |
* | | | | Add new ci config entry that handles cache configGrzegorz Bizon2016-06-272-0/+93
| | | | |
* | | | | Add ci config entry that represents array of pathsGrzegorz Bizon2016-06-241-0/+34
| | | | |
* | | | | Add ci config class that represents a boolean valueGrzegorz Bizon2016-06-241-0/+34
| | | | |
* | | | | Add ci config class that represents a key valueGrzegorz Bizon2016-06-241-0/+34
| | | | |
* | | | | Fix ci config cache validation in legacy processorGrzegorz Bizon2016-06-241-1/+14
| | | | |
* | | | | Minor refactorings in new CI configuration classesGrzegorz Bizon2016-06-231-2/+2
| | | | |
* | | | | Move CI stages configuration to new CI configGrzegorz Bizon2016-06-234-7/+88
| | | | |
* | | | | Assume that unspecified CI config is undefinedGrzegorz Bizon2016-06-235-81/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assume that when someone adds a key for the configuration entry, but does not provide a valid value, which causes entry to be `nil`, then entry should be considered as the undefined one. We also assume this is semantically correct, this is also backwards compatible with legacy CI config processor. See issue #18775 for more details.
* | | | | Return default config value when entry is undefinedGrzegorz Bizon2016-06-223-31/+42
| | | | |
* | | | | Handle CI environment variables in a new CI configGrzegorz Bizon2016-06-223-3/+77
| | | | |
* | | | | Rename CI config null node entry to undefined nodeGrzegorz Bizon2016-06-222-7/+7
| | | | |
* | | | | Handle after script CI config in new classesGrzegorz Bizon2016-06-214-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | This also makes Script to return an array of commands instead of concatented command, which is our current direction.
* | | | | Handle CI services config in new CI config classesGrzegorz Bizon2016-06-213-4/+54
| | | | |
* | | | | Move CI image configuration entry to new CI configGrzegorz Bizon2016-06-212-9/+21
| | | | |
* | | | | Add image configuration entry to new ci configGrzegorz Bizon2016-06-211-0/+46
| | | | |
* | | | | Use generic type validator in new ci configurationGrzegorz Bizon2016-06-211-0/+6
| |_|_|/ |/| | |
* | | | Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-2018-27/+5982
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (345 commits) use rails root join fixed a couple of errors spotted in production Fix RangeError exceptions when referring to issues or merge requests outside of max database values Fix bug in `WikiLinkFilter`. Small frontend code fixes and restore 8a2d88f commit Warn about admin privilege to disable GitHub Webhooks Listing GH Webhooks doesn't stop import process for non GH admin users fixup! updated docs for api endpoint award emoji Update CHANGELOG Ensure Todos counters doesn't count Todos for projects pending delete Add endpoints for award emoji on notes Sort API endpoints and implement feedback Add endpoints for Award Emoji Fixed issue with assignee dropdown not selecting correctly Removed update method Re-structured controller spec Renamed issuable param to issuable_id Fix clibpoard buttons on "Check out branch" modal. Track method call times/counts as a single metric Cache todo counters (pending/done) Fix a 'wrong number of arguments' error Added missing mount point for Sidekiq Metrics API, after it got lost on rebase. ...
View Lorry Controller Status