summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-214-10/+55
| | | | | | | Also allow merge request to be merged with skipped pipeline and the "only allow merge when pipeline is green" feature enabled Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'use-build-in-broadcast-message-spec' into 'master' Rémy Coutable2016-11-211-1/+1
|\ | | | | | | | | Use build instead create in BroadcastMessage model spec See merge request !7592
| * Use build instead create in BroadcastMessage model specSemyon Pupkov2016-11-191-1/+1
| |
* | Merge branch '24627-fix-bad-mr-error-message' into 'master' Rémy Coutable2016-11-211-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Fixes regression causing an error message to appear when user first enters the Merge Request form. Closes #24627 See merge request !7599
| * | Fix regression in Merge request formAlex Sanford2016-11-191-0/+7
| | | | | | | | | | | | | | | | | | Merge request !7163 caused an error message to appear on the Merge Request form when it was first loaded by the user. This commit fixes that regression bug.
* | | Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master' Jacob Schatz2016-11-191-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken merge request widget spec ## What does this MR do? Converts the invalid es6 syntax of the merge_request_widget_spec which is actually causing the spec not to run through teaspoon ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Get specs working again ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 #24673 See merge request !7594
| * | | Fix spec24673-broken-test-in-merge_request_widget_spec-jsClement Ho2016-11-181-2/+2
| | |/ | |/|
* | | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1919-230/+990
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] 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 it does - 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? Closes #22539 See merge request !7015
| * | Fix test22539-display-foldersFilipa Lacerda2016-11-191-22/+11
| | |
| * | Fix broken testFilipa Lacerda2016-11-191-0/+20
| | |
| * | Changes for stop url to pathFilipa Lacerda2016-11-191-16/+0
| | |
| * | Try to fix testsKamil Trzcinski2016-11-181-4/+5
| | |
| * | Bring back the `commit_url` as it's used by CycleAnalyticsKamil Trzcinski2016-11-181-0/+4
| | |
| * | Fix broken testsFilipa Lacerda2016-11-182-11/+11
| | |
| * | Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-11-188-261/+175
| |\ \ | | | | | | | | | | | | 22539-display-folders
| | * | Swaps url for paths in mock dataFilipa Lacerda2016-11-171-11/+10
| | | |
| | * | Fix Rubocop offense for lines in environment specsGrzegorz Bizon2016-11-171-1/+0
| | | |
| | * | Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1718-130/+386
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Remove extra subscribable_type filter on migration Add feature spec for labels subscription Avoid code duplication for label subscription status on label partial Rename LabelSubscription javascript to ProjectLabelSubscription Fix label subscription menu on small screens resolution Allow users to subscribe to a group label at group or project level Use button instead of an icon to subscribe/unsubscribe to labels Add CHANGELOG entry Add toggle_subscription action to Groups::LabelsController Allow subscriptions to be created without a project Use subqueries instead of joins to migrate subscriptions Add helper method to toggle label subscription on labels controller spec Remove default value for `project` argument on subscribable concern Use @project as default on ToggleSubscriptionAction concern Allow users to subscribe to group labels at project-level Pass project to Entities::Label to check if user is subscribed Fix specs to pass a project when creating subscriptions Refactoring label subscription toggle button text to accept a project Refactoring label subscription status to accept a project Refactoring notification service to find subscriptions per project ...
| | * \ \ Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1789-331/+1348
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (154 commits) Fix typos Fix wrong changelog item Add missing item for 8.13.6 Change last_used_at to use touch Add chat_name partial Mention Git strategy none Fix code review adds fix for security issue when annonymous user does not ... Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README ... Conflicts: spec/features/environments_spec.rb
| | * | | | Fix test case for environments related to deploymentsGrzegorz Bizon2016-11-171-7/+14
| | | | | |
| | * | | | Do not use absolute URLS in entities use relativeGrzegorz Bizon2016-11-175-10/+10
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into 22539-display-foldersKamil Trzcinski2016-11-18158-408/+3711
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Unfold dropdown in tests for environments indexGrzegorz Bizon2016-11-171-4/+9
| | | | | |
| * | | | | Fix environments specs for deployment with SHAGrzegorz Bizon2016-11-161-2/+6
| | | | | |
| * | | | | TestsFilipa Lacerda2016-11-162-4/+2
| | | | | |
| * | | | | Fix broken url for stop actionFilipa Lacerda2016-11-161-1/+6
| | | | | |
| * | | | | Adds new line to eofFilipa Lacerda2016-11-161-1/+1
| | | | | |
| * | | | | Fixes broken testsFilipa Lacerda2016-11-162-96/+109
| | | | | |
| * | | | | Fix eslintFilipa Lacerda2016-11-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused method
| * | | | | Fix view that embeds abilities for the environmentsGrzegorz Bizon2016-11-161-1/+0
| | | | | |
| * | | | | Adds missing tests for commit componentFilipa Lacerda2016-11-161-68/+107
| | | | | |
| * | | | | Fix eslint errorsFilipa Lacerda2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop error
| * | | | | Adds props validationFilipa Lacerda2016-11-166-275/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves documentation Adds tests Fix prop validation for objects Finish tests for environment item Adds tests for toggle folder function Environment tests Adds tests
| * | | | | Adds testsFilipa Lacerda2016-11-161-10/+108
| | | | | |
| * | | | | Revert changes made on rspec tests for environmentFilipa Lacerda2016-11-161-89/+74
| | | | | |
| * | | | | Adds testsFilipa Lacerda2016-11-1612-0/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests. Changes instance into a constructor Adds tests for environments component Adds tests assertations Adds external URL test Adds tests for Rollback component Adds tests for stop component Adds tests for actions component Fix environment item Init environment item tests
| * | | | | Adds template functionsFilipa Lacerda2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adds commit component
| * | | | | Remove unused blockFilipa Lacerda2016-11-161-5/+0
| | | | | |
| * | | | | Adds a list of environmentsFilipa Lacerda2016-11-161-25/+24
| | | | | |
| * | | | | Removes loading assertionsFilipa Lacerda2016-11-161-18/+0
| | | | | |
| * | | | | Fixes the testsFilipa Lacerda2016-11-162-32/+142
| | | | | |
| * | | | | Add controller specs for environments index actionGrzegorz Bizon2016-11-161-6/+27
| | | | | |
| * | | | | Fix whitespaceFilipa Lacerda2016-11-161-5/+1
| | | | | |
| * | | | | Adds tests for environment store.Filipa Lacerda2016-11-162-82/+50
| | | | | |
| * | | | | Removes trailing whitespaceFilipa Lacerda2016-11-161-2/+2
| | | | | |
| * | | | | Fixes filterFilipa Lacerda2016-11-162-2/+22
| | | | | |
| * | | | | Adds tests for environments storeFilipa Lacerda2016-11-162-0/+96
| | | | | |
| * | | | | Fix SCSS lint errorsFilipa Lacerda2016-11-161-236/+237
| | | | | | | | | | | | | | | | | | | | | | | | Fixes some tests
| * | | | | testsFilipa Lacerda2016-11-161-225/+259
| | | | | |
* | | | | | Merge branch 'fix/require-build-script-configuration-entry' into 'master' issues-copyKamil Trzciński2016-11-193-34/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make job script a required configuration entry ## What does this MR do? This MR makes a job script a required configuration entry. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #24575 See merge request !7566
View Lorry Controller Status