summaryrefslogtreecommitdiff
path: root/spec/features/projects
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-211-5/+7
|\ | | | | | | | | | | | | Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763
| * Changes after reviewFilipa Lacerda2016-12-211-5/+7
| | | | | | | | | | | | Fix broken test Remove spinach tests for the builds tab
* | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-15/+19
|\ \ | |/ |/| | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| * Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵Kamil Trzcinski2016-12-201-9/+4
| |\ | | | | | | | | | into zj-mattermost-slash-config
| | * Fix rspec tests due to different APIZ.J. van de Weg2016-12-201-8/+4
| | | | | | | | | | | | [ci skip]
| | * Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-201-1/+0
| | |
| * | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-201-2/+2
| |\ \ | | |/ | |/|
| * | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵Kamil Trzcinski2016-12-201-35/+5
| |\ \ | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | Fix testsLuke "Jared" Bennett2016-12-201-35/+5
| | | |
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-202-19/+56
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-191-0/+30
| |\ \ \
| * | | | Added integration testsLuke "Jared" Bennett2016-12-191-14/+53
| | | | |
* | | | | Merge branch 'fix/25843' into 'master' Sean McGivern2016-12-202-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename SlackNotificationService back to SlackService ## What does this MR do? See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843 /cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan See merge request !8208
| * | | | | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-202-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-202-9/+65
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
| * | | | Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelinesGrzegorz Bizon2016-12-201-8/+17
| | | | |
| * | | | Move test for HTML stage endpoint to controller specsGrzegorz Bizon2016-12-202-33/+1
| | | | |
| * | | | Fix broken testFilipa Lacerda2016-12-201-1/+1
| | | | |
| * | | | Fix broken testFilipa Lacerda2016-12-201-1/+4
| | | | | | | | | | | | | | | | | | | | Changes after review
| * | | | Adds tests for the mini pipeline graphFilipa Lacerda2016-12-201-3/+47
| | | | |
| * | | | Improve specsKamil Trzcinski2016-12-201-2/+5
| | | | |
| * | | | Add tests for stage API endpointKamil Trzcinski2016-12-201-0/+29
| | | | |
* | | | | Merge branch 'fix_team_member_expiration_date_spec' into 'master' Grzegorz Bizon2016-12-201-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix member with expiration date feature spec See merge request !8186
| * | | | Fix member with expiration date feature specfix_team_member_expiration_date_specFelipe Artur2016-12-191-2/+2
| |/ / /
* | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-201-0/+40
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slack slash commands ## What does this MR do? Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. ## Why was this MR needed? We want to expose Slack Slash Commands as a first-class service. ## What are the relevant issue numbers? Supersedes !8007 Closes #22182 See merge request !8126
| * | | Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-191-22/+14
| | | |
| * | | Improve after feedbackKamil Trzcinski2016-12-191-9/+9
| | | |
| * | | Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-181-0/+48
| | | | | | | | | | | | | | | | Added tests
* | | | Make CI badge hitboxes better match containerMitchell Hentges2016-12-191-18/+15
| | | |
* | | | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-191-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve icons and style for manual build status ## What does this MR do? This MR changes the CSS class for manual build status badge to make it a little more different than skipped build status badge. It makes it darker. ## Screenshots ![Screen_Shot_2016-12-17_at_13.37.58](/uploads/9628f0e84fdaad82d8833f546f0192a6/Screen_Shot_2016-12-17_at_13.37.58.png)![Screen_Shot_2016-12-17_at_13.31.48](/uploads/fe8e27df0274b9f9ae840110593a298a/Screen_Shot_2016-12-17_at_13.31.48.png) See merge request !8102
| * | | Fix CI/CD statuses actions' CSS on pipeline graphsGrzegorz Bizon2016-12-171-1/+1
| | | |
* | | | Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-1827-166/+974
|\ \ \ \ | | |_|/ | |/| |
| * | | Improve test for sort dropdown on members pageNur Rony2016-12-161-0/+9
| | | |
| * | | Use factories to create project/group membership on specsDouglas Barbosa Alexandre2016-12-161-2/+2
| | | |
| * | | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-161-0/+7
| | | |
| * | | Add feature spec for sort functionality on group/project members listDouglas Barbosa Alexandre2016-12-161-0/+82
| | | |
| * | | Merge branch '18435-autocomplete-is-not-performant' into 'master' Fatih Acet2016-12-161-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make autocomplete request performant ## What does this MR do? Restricts the `autocomplete_sources`action to returning the `json`of one specific `at` type at a time. Makes sure all commands start by immediately showing the `loading` dropdown. If the `loading` dropdown is active, we will request and load in the data for that specific `at` type. We manually trigger the filter again. This time, if `loading` dropdown is not active, initiate default filter behaviour and use the correct data template. Also fixes an issue where `setup` was called multiple times by only setting up and destroying atwho on a focused/blured input. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `autocomplete_sources` was requested on page load and is large. ## Screenshots (if relevant) 3 requests for 3 different first-time references. ![Screen_Shot_2016-10-14_at_14.43.12](/uploads/0b04eab0d0bf3638d6d6e431036b8089/Screen_Shot_2016-10-14_at_14.43.12.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [x] 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 #22802 Closes #18435 See merge request !6856
| | * | Changed autocomplete_sources into an action that returns a single 'at' type ↵18435-autocomplete-is-not-performantLuke Bennett2016-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of sources at a time Finished up autocomplete_sources action and added frontend to fetch data only when its needed Added wait_for_ajax to specs Fixed builds and improved the setup/destroy lifecycle Changed global namespace and DRYed up loading logic Added safety for accidentally loading data twice Removed destroy as its not necessary and is messing with click events from a blur race condition Created AutocompleteSourcesController and updated routes Fixed @undefined from tabbing before load ends Disable tabSelectsMatch until we have loaded data Review changes
| * | | Merge branch '22604-manual-actions' into 'master' Grzegorz Bizon2016-12-161-0/+85
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Manual actions on pipeline graph" ## What does this MR do? Improves the pipeline graph: - add actions to each node - always show the status icon - improves style - adds new icons to use only on the pipeline graph - fixes tooltip body - adds partial to render the graph node ### Hover state: @dimitrieh This MR does not implements 100% of the mockups - https://gitlab-org.gitlab.io/gitlab-design/progress/dimitrie/pipelines-graphic/22604-spec-previews/#artboard0 As you can see in the mockups, each node has 2 separate hover states, one for the all content and one for the action icon. In order to not hover the all content when we hover the action icon we would need to refactor the all HTML & CSS of all the pipeline graph, lines included. The hover problem can be seen in the following video. [video](https://drive.google.com/file/d/0B2xW80W4hUf0cnJoS1RGQ2hWZlU/view) As you can see in the video, the build node is hovered even when the mouse seems to be far from the element. It does not seem wise to me to change the HTML & CSS now for two reasons: - we would need to rewrite almost everything; - we will probably rewrite everything when we move this to vue. Given the latter point, and considering it will be a bug effort to make the hover states equal to the mockups, I suggest we do that when we rewrite the all view. This is fixable, though, but requires some effort & time. I can, although, be missing something. @annabeldunstone do you see any quick/easy fix here? ## Screenshots (if relevant) [video](https://drive.google.com/file/d/0B2xW80W4hUf0OFhZaXlKTW5mS3c/view?usp=sharing) ![Screen_Shot_2016-12-12_at_12.38.25](/uploads/8f015b0d476c832912e1530208f3d70d/Screen_Shot_2016-12-12_at_12.38.25.png) ![Screen_Shot_2016-12-12_at_12.38.31](/uploads/51de435f1120142d9683f06854d66507/Screen_Shot_2016-12-12_at_12.38.31.png) ![Screen_Shot_2016-12-12_at_12.38.39](/uploads/642e7348bcf46a03d13d8eac1cb7ce6b/Screen_Shot_2016-12-12_at_12.38.39.png) ![Screen_Shot_2016-12-12_at_12.40.00](/uploads/781743893bc14cf05f4b8f258e2b58ba/Screen_Shot_2016-12-12_at_12.40.00.png) Tooltip before ![Screen_Shot_2016-12-06_at_11.29.54](/uploads/b16c0434981a89fb68c4c053c2f1d6e6/Screen_Shot_2016-12-06_at_11.29.54.png) Tooltip after ![Screen_Shot_2016-12-06_at_11.56.03](/uploads/e5e0ede0f3f8a5434e98373ab8a72500/Screen_Shot_2016-12-06_at_11.56.03.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [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 #22604 See merge request !7931
| | * | Changes after reviewFilipa Lacerda2016-12-151-34/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes after review Fix tooltip title Remove unneeded string interpolation
| | * | Fix testsFilipa Lacerda2016-12-151-10/+29
| | | |
| | * | Fix broken testsFilipa Lacerda2016-12-141-3/+3
| | | |
| | * | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-148-7/+131
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (151 commits) Improve build status specs contexts descriptions Add some missing tests for detailed status methods Fix wrong error message expectation in API::Commits spec Remove trailing blank line from Allowable module Move admin settings spinach feature to rspec Encode when migrating ProcessCommitWorker jobs Prevent overflow with vertical scroll when we have space to show content Make rubocop happy API: Ability to cherry-pick a commit Be smarter when finding a sudoed user in API::Helpers Update manual build icon SVG Make it possible to mix `Gitlab::Routing` in Backport hooks on group policies for the EE-specific implementation Extract abilities checking module from ability model Extend tests for pipeline detailed status helpers Add tests for common build detailed status helpers Add missing tests for build `cancelable?` method Add tests for detailed build statuses factory Make it possible to retry build that was canceled Make build retryable only if complete and executed ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/models/ci/build.rb app/models/ci/pipeline.rb app/models/ci/stage.rb app/models/commit_status.rb app/views/admin/runners/show.html.haml app/views/projects/builds/_header.html.haml app/views/projects/ci/builds/_build.html.haml app/views/projects/ci/builds/_build_pipeline.html.haml app/views/projects/ci/pipelines/_pipeline.html.haml app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml app/views/projects/pipelines/_info.html.haml lib/gitlab/ci/status/build/common.rb lib/gitlab/ci/status/build/play.rb lib/gitlab/ci/status/build/stop.rb lib/gitlab/ci/status/core.rb spec/lib/gitlab/ci/status/pipeline/common_spec.rb
| | * | Adds new partial for graph icons.Filipa Lacerda2016-12-091-3/+3
| | | | | | | | | | | | | | | | Fix tests
| | * | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-092-0/+160
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' ... Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' Updating reference to database password Update CHANGELOG.md for 8.13.9 Update CHANGELOG.md for 8.14.4 Don't check if stage name doesn't exist Various small emoji positioning adjustments Add nested groups support on data level Update factory_girl_rails to 4.7.0 Correct previous stable branch used in 8.14 to 8.15 update guide Enable display of admonition icons in Asciidoc. add link_to_if helper on target_branch link on Merge Request ... Fade out should be white instead of gray Do nothing if file is undefined fix: 24982- Remove'Signed in successfully' message After this ... adds impersonator variable and makes sudo usage overall more clear Reenables /user API request to return private-token if user is ... Fixed timeago re-rendering every element ...
| | * | | Adds tests for the status and actions icons rendered in the pipeline graphFilipa Lacerda2016-12-071-0/+41
| | | | | | | | | | | | | | | | | | | | Fix padding in dropdown
| * | | | Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-152-2/+2
| | |_|/ | |/| |
| * | | Merge branch '25136-last-deployment-link' into 'master' Grzegorz Bizon2016-12-141-0/+37
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839
| | * | | Changes after review25136-last-deployment-linkFilipa Lacerda2016-12-071-17/+14
| | | | |
| | * | | Changes after reviewFilipa Lacerda2016-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | Fix error