summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'search-filters-label-fix' into 'master' Jacob Schatz2016-09-231-0/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed search dropdown labels not displaying ## What does this MR do? Returns the search controller method after finding the project & group. ## Why was this MR needed? The search controller was returning early when the search term was empty causing a bug where the dropdown toggles wouldn't show the correct text - instead defaulting to `Any`. ## Screenshots (if relevant) ![Screen_Shot_2016-09-09_at_12.09.57](/uploads/8c6bb36f4e163312314611d2877d5fa4/Screen_Shot_2016-09-09_at_12.09.57.png) ## What are the relevant issue numbers? Closes #21783 See merge request !6277
| * Fixed search dropdown labels not displayingsearch-filters-label-fixPhil Hughes2016-09-121-0/+32
| | | | | | | | | | | | This would only happen when the search term was empty because the method was returning before the controller could find the group or project for the toggle Closes #21783
* | Revert part of "Merge branch 'update_issues_mr_counter' into 'master'Rémy Coutable2016-09-222-41/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Revert "Merge branch ↵Rémy Coutable2016-09-221-13/+7
| | | | | | | | | | | | | | '22421-fix-issuable-counter-when-more-than-one-label-is-selected' into 'master' " This reverts commit 8ed5be5935a77fffe730baa188d1e1fc1c739d72, reversing changes made to fb0d1378f4f3365a9cae0938829da0560a92b6e6.
* | Hotfix the issuable counters when filtering by multiple labels22421-fix-issuable-counter-when-more-than-one-label-is-selectedRémy Coutable2016-09-221-7/+13
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | fixing security specs after mergeJames Lopez2016-09-211-1/+1
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-2115-126/+335
|\ \
| * \ Merge branch 'slash-commands-load-fix' into 'master' Robert Speicher2016-09-201-0/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed slash commands not loading ## What does this MR do? Fixes an issue with slash commands not working when the autocomplete source is loading & then the new issue button is clicked. This also fixes an issue where the autocomplete source is loaded on pages where it isn't actually needed. ## What are the relevant issue numbers? Closes #21774, #21807 See merge request !6207
| | * | Use admin user in testsPhil Hughes2016-09-161-3/+1
| | | |
| | * | Correctly loads gfm autocomplete source on pages where it is requiredPhil Hughes2016-09-161-0/+23
| | | |
| * | | fix issues mr counterbarthc2016-09-203-8/+49
| | | |
| * | | Merge branch 'merge-request-push-compare-ui' into 'master' Jacob Schatz2016-09-201-3/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frontend for Merge Request Diff This merge request improves the UX for the merge request diff feature which was recently implemented here (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127). Specifically, it styles various parts of the diff feature to match the designs, it disables comment-related buttons in states where comments are disabled, and it adds a 'Show latest version' button for convenience. ## Are there points in the code the reviewer needs to double check? I could use feedback on this MR's fidelity to the design. ## Why was this MR needed? Neccessary styling improvements for basic UX of this feature, and enabled comment buttons are not functional and thus need to be disabled in certain states. ## Screenshots (if relevant) ![57dd0755f0b14342305909](/uploads/318a44a3bc8b7fc5c9c6ef92ba92e511/57dd0755f0b14342305909.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127 cc: @jschatz1 See merge request !6343
| | * \ \ Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-205-6/+49
| | |\ \ \
| | * | | | Shush rubocop.Bryce Johnson2016-09-191-1/+0
| | | | | |
| | * | | | Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-191-3/+12
| | | | | |
| * | | | | Improve the Unsubscribe confirmation pageRémy Coutable2016-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix initial implementation to actually render the unsubscribe pageRémy Coutable2016-09-201-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix "Unsubscribe" link in notification emails that is triggered by anti-virusMaximiliano Perez Coto2016-09-201-0/+54
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Created a force=true param that will continue with the previous behaviour of the unsubscribe method * Created a filter for not-logged users so they see a unsubsribe confirmation page * Added the List-Unsubscribe header on emails so the email client can display it on top
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-09-204-6/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-download-artifacts-button-link * upstream/master: (80 commits) Contributing via GH no longer encouraged. Update README.md to really fix icon Update README.md to fix icon Allow to set request_access_enabled for groups and projects using API Restrict last_activity_at updates to one per hour Solve code review comments Properly support Gitlab::Auth::Result Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 Move Gitlab::Auth.Result to separate file Added CHANGELOG Fix spec failures Support pushing via SSH Fix specs failures Don't leak build tokens in build logs Fix permissions for creating container images Fix old CHANGELOG entries Add linting for duplicate CHANGELOG versions (!6039) Ensure validation messages are shown within the milestone form Fix validation regexs (+1 squashed commit) Squashed commits: [f9a9315] Use : to test invalid environment name Fix scope of the CI config key nodes in jobs entry ...
| | * \ \ \ Merge branch 'master' into ↵21961-issues-filtering-issue-with-labels-that-contain-spacesLuke "Jared" Bennett2016-09-1911-142/+214
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | '21961-issues-filtering-issue-with-labels-that-contain-spaces' # Conflicts: # app/assets/javascripts/gl_dropdown.js
| | | * | | Merge branch 'fix/import-export-db-errors' into 'master' Rémy Coutable2016-09-191-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import/export database errors Fixes protected branches errors when importing a project including them Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799 See merge request !6099
| | | | * | | squashed - Fix DB exceptions raised importing some specific projects.James Lopez2016-09-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better import of labels, milestones and protected branches. Updated relevant specs. Loose pipeline validation on importing, so it does not fail when there are missing fields, which are not validated at DB level. Also, updated spec with relevant test.
| | | * | | | Merge branch 'review-apps' into 'master' Rémy Coutable2016-09-191-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for dynamic environments Implements proposal described in https://gitlab.com/gitlab-org/gitlab-ce/issues/21971. Specifically: - it adds a `.gitlab-ci.yml` configuration, - it allows environment name to have slashes, - it allows environment names to use CI predefined variables, - it allows to specify URL from `.gitlab-ci.yml`, - it allows the URL to use CI predefined variables, - it introduces `environment_type` to allow to easily group environments in the future See merge request !6323
| | | | * | | | Fix validation regexs (+1 squashed commit)Kamil Trzcinski2016-09-191-1/+1
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits: [f9a9315] Use : to test invalid environment name
| | | * | | | Ensure validation messages are shown within the milestone formMark Fletcher2016-09-191-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove call to Milestone#save! instead just Milestone#save * Add safety specs to stop a regression Fixes #22033
| | * | | | | Replace single quotes with escaped single quotes and write spec to test ↵Luke Bennett2016-09-141-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple lable selection over a page load Added spec for removing label with space and single quote Fixed removing label with single quote
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵fix-download-artifacts-button-linkLin Jen-Shin2016-09-191-105/+72
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-download-artifacts-button-link * upstream/master: Reset pushes_since_gc counter before specs run to ensure starting point is 0 Add missing spec for ProtectedBranches::CreateService Refactor boards_spec.rb to avoid code duplication Render invalid template for merge requests without source project and open
| | * | | | | Refactor boards_spec.rb to avoid code duplicationfix-board-spec-failuresStan Hu2016-09-161-105/+72
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Originally created to address #21197, but !6224 solved the intermittent spec failures.
| * | | | | Fix download artifacts button link:Lin Jen-Shin2016-09-194-4/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails ignored unused arguments and ref_name_and_path is the last path argument, therefore we need to concatenate that parts ourselves. Otherwise, 'download' won't be shown at all.
| * | | | Replace contributions calendar timezone payload with datesClement Ho2016-09-161-0/+39
| | |/ / | |/| |
* | | | Merge branch 'feature/import-export-security-specs' into 'master' Douwe Maan2016-09-202-1/+81
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Import/Export security specs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !1987
| * | | more spec refactoring based on feedbackJames Lopez2016-09-092-3/+17
| | | |
| * | | fix wordingJames Lopez2016-09-091-2/+2
| | | |
| * | | fixing a couple of bugs and lots of refactoring of the export file specJames Lopez2016-09-091-3/+12
| | | |
| * | | more refactoring of the specsJames Lopez2016-09-091-25/+2
| | | |
| * | | refactored specs based on feedbackJames Lopez2016-09-091-86/+4
| | | |
| * | | fix specs so they work in EE straight awayJames Lopez2016-09-091-1/+1
| | | |
| * | | Export integration test and attribute change spec - squashedJames Lopez2016-09-091-0/+162
| | | | | | | | | | | | | | | | | | | | | | | | Export file integration test that checks for sensitive info. Also added spec to check new added attributes to models that can be exported.
* | | | Merge branch 'issue_21824' into 'master' Fatih Acet2016-09-161-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issuable templates dropdown for forked projects fixes #21824 See merge request !6329
| * | | | Fix issuable templates dropdown for forked projectsissue_21824Felipe Artur2016-09-151-8/+12
| | | | |
* | | | | Merge branch 'issue-boards-keyboard-shortcut' into 'master' Jacob Schatz2016-09-152-22/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added keyboard shortcut to navigate to issue boards ## What does this MR do? Adds a keyboard shortcut of `g l` to navigate to issue boards. `g b` would work nicer. However that is taken by builds. Open to suggestions. ## What are the relevant issue numbers? Closes #21218 See merge request !6248
| * | | | | Fixed testsissue-boards-keyboard-shortcutPhil Hughes2016-09-152-22/+17
| | | | | | | | | | | | | | | | | | | | | | | | Added wait for vue helper
| * | | | | Added keyboard shortcut to navigate to issue boardsPhil Hughes2016-09-151-0/+20
| |/ / / / | | | | | | | | | | | | | | | Closes #21218
* | | | | Merge branch '18849-project-snippets-page-isn-t-really-responsive' into ↵Jacob Schatz2016-09-152-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update snippets UI ## What does this MR do? Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849. ## Are there points in the code the reviewer needs to double check? Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png) ![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png) ![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18849 See merge request !6210
| * | | | Reordered dropdown options18849-project-snippets-page-isn-t-really-responsiveLuke Bennett2016-09-072-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearranged datetime created line Added `avatar_class` option to `link_to_member` so it can be hidden Made snippet title font heavier Added file title bar Hidden unneeded info from xs screens Added visibility icon Reveal file-actions on xs screens Added comments icon to snippets list items Refactored no-comments declaration into framework stylesheet Final touch ups Fixed snippets_spec
* | | | | Merge branch 'rs-fix-todos-filtering-spec' into 'master' Rémy Coutable2016-09-151-4/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve validity of spec/features/todos/todos_filtering_spec.rb Previously, we were checking that a CSS selector string didn't have some page-related content, which, of course it didn't. Now we check against the actual content of the selector, we use a more semantic selector, and we add an additional expectation for the text that _should_ be there, as an additional sanity check. See merge request !6356
| * | | | | Improve validity of spec/features/todos/todos_filtering_spec.rbrs-fix-todos-filtering-specRobert Speicher2016-09-141-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were checking that a CSS selector string didn't have some page-related content, which, of course it didn't. Now we check against the actual content of the selector, we use a more semantic selector, and we add an additional expectation for the text that _should_ be there, as an additional sanity check.
* | | | | | Merge branch 'issue-description-scroll-fix' into 'master' Fatih Acet2016-09-151-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger autosize update after template selection ## What does this MR do? Triggers an autosize update after selecting an issue template. The autosize plugin doesn't react to value changes and therefore doesn't automatically update when the user selects the template. This merge request adds it so that it detects if the editor the template selector is a jQuery object (not Ace editor) & then triggers the autosize event to allow the user to scroll the textarea. ## Screenshots (if relevant) ![resize](/uploads/1ab04b4202309b13f1178e04c0953112/resize.gif) ## What are the relevant issue numbers? Closes #21982 See merge request !6282
| * | | | | Trigger autosize update after template selectionissue-description-scroll-fixPhil Hughes2016-09-091-0/+13
| | |/ / / | |/| | | | | | | | | | | | | Closes #21982
* | | | | add test about flash alertubudzisz2016-09-141-2/+6
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests with dependent destroy add tests with dependent destroy add tests add tests to projects spec update it title and remove let update it title and remove let remove changes after rebase remove changes after rebase update changelog