summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-141-1/+1
|
* expect final newlines from the banzai filterhttp://jneen.net/2016-07-141-1/+1
|
* remove uses of the nowrap: featurehttp://jneen.net/2016-07-141-9/+9
|
* rm spec for a deleted methodhttp://jneen.net/2016-07-141-14/+0
|
* Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-111-16/+1
|\
| * Disable overflow messagesSean McGivern2016-07-081-16/+1
| | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more.
* | Merge branch 'master' into faster-diffsDouwe Maan2016-07-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb
| * Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-1/+1
| |
* | fix up testsLuke "Jared" Bennett2016-07-061-1/+1
|/ | | | | | Added more exceptions Added handling inline view type
* New :request_access ability to replace a ugly helperRémy Coutable2016-07-051-66/+0
| | | | | | | | | | | - Group / project members cannot request access - Group members cannot request access to a group's project This addresses an issue where project owners could request access to their own project, leading to UI inconsistency where their requester status would replace their owner status. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-011-0/+66
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude requesters from Project#members, Group#members and User#members ## What does this MR do? It excludes requesters from the `Project#members`, `Group#members` and `User#members` associations, and adds new `Project#requesters` and `Group#requesters` associations. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Without this, if you call `project.members`, requesters are included in the results! This is at best misleading, and at worst can lead to security issues. By excluding requesters from the `#members` associations, we avoid introducing security inadvertently since you have to call the `#requesters` association explicitly to get requesters. ## What are the relevant issue numbers? This is something I realized while fixing the security issue #19102. ## Does this MR meet the acceptance criteria? - [x] I don't think this needs a CHANGELOG since this is an internal change - Tests - [x] 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 !4946
| * Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-011-0/+66
| | | | | | | | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-2/+0
|/
* Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-291-2/+8
|
* Be explicit which project and user ID are memoizedStan Hu2016-06-291-0/+14
|
* Memoize the maximum access level for the author of notesStan Hu2016-06-291-0/+32
| | | | | | | In #19273, we saw that retrieving ProjectTeam#human_max_access for each note takes the bulk of the time when rendering certain issues or merge requests. We observe that most of the comments in an issue are typically done by the same users. This MR memoizes the max access level by user ID.
* Remove Haml helpers from the visibility level spec.Connor Shea2016-06-221-5/+0
|
* Correctly adds commit ID into dropdownPhil Hughes2016-06-181-45/+0
| | | | | Removes un-used method Fixes other Ruby issues
* Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-171-0/+48
| | | | | | | | | When you are the last owner of a group or the owner of a project, you don't have the :update_<source>_member / :destroy_<source>_member abilities, but you do have the :admin_<source>_member so you should be able to see your members access levels. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'remove_jiraissue' into 'master' Robert Speicher2016-06-171-3/+3
|\ | | | | | | | | | | | | | | | | Remove JiraIssue model and replace references with ExternalIssue This MR Removes unused JiraIssue class and replaces references with ExternalIssue Closes #18203 See merge request !4659
| * Remove JiraIssue model and replace references with ExternalIssueIlan Shamir2016-06-161-3/+3
| |
* | Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-151-16/+0
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-143-108/+101
| | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
* Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-2/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add request access for groupsRémy Coutable2016-06-142-10/+158
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-131-13/+3
|
* Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-1/+2
| | | | | | | | | | | | | | | | | | - 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
* | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-7/+4
|\ \
| * \ Merge branch 'master' into awardablesZJ van de Weg2016-05-302-2/+2
| |\ \ | | |/
| * | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-2/+2
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-182-48/+94
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| * \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-118-12/+169
| |\ \ \ \
| * | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-7/+4
| | | | | |
* | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-022-3/+3
| |_|_|_|/ |/| | | |
* | | | | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-242-2/+2
| |_|_|/ |/| | | | | | | | | | | Also removes the note from the development/testing.md guide
* | | | Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-2/+2
| |_|/ |/| | | | | | | | Gitlab::Diff::InlineDiff
* | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' Douwe Maan2016-05-121-47/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clean up EventsHelper spec Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4133
| * | | Clean up EventsHelper specRobert Speicher2016-05-121-47/+48
| | |/ | |/|
* | | more readable specs for enabled_button_based_providers and ↵Andrei Gliga2016-05-121-15/+29
| | | | | | | | | | | | button_based_providers_enabled?
* | | DRYing enabled_button_based_providers testsAndrei Gliga2016-05-121-7/+4
| | |
* | | enabled_button_based_providers into their own describe sectionAndrei Gliga2016-05-121-0/+2
| | |
* | | use stub_application_setting insteadAndrei Gliga2016-05-121-10/+4
| | |
* | | between ""Andrei Gliga2016-05-121-1/+1
| | |
* | | tests for button_based_providers_enabled? helper method of AuthHelperAndrei Gliga2016-05-121-0/+18
| | |
* | | tests for enabled_button_based_providers helper method of AuthHelperAndrei Gliga2016-05-121-1/+21
|/ /
* | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-091-5/+5
|\ \ | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
| * | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-041-5/+5
| | | | | | | | | | | | Mostly replaces several Spinach tests with RSpec Feature tests.
* | | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate to handle case-sensitive SVG attributes. sanitize parses documents as HTML instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased. * SVG element list: https://www.w3.org/TR/SVG/eltindex.html * SVG attribute list: https://www.w3.org/TR/SVG/attindex.html Closes #14555
* | | Sanitize repo paths in new project error messageStan Hu2016-05-041-0/+9
|/ / | | | | | | Closes #17243
View Lorry Controller Status