summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-201-8/+91
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin projects spinach tests to RSpec Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !8174
| * | | | | | Move admin projects spinach tests to rspecSemyon Pupkov2016-12-191-8/+91
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-202-0/+60
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add online terminal support for Kubernetes ## What does this MR do? Gives terminal access to kubernetes-deployed environments via the deployment service ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Part of idea to production ## Screenshots (if relevant) ### `/root/reviewing/environments` ![Screen_Shot_2016-12-15_at_19.10.40](/uploads/bd2c54c07b6c85dec3328a20cd185b64/Screen_Shot_2016-12-15_at_19.10.40.png) ### `/root/reviewing/environments/10013` ![Screen_Shot_2016-12-19_at_12.52.39](/uploads/db4e4e06cda88437e8727433d65898b9/Screen_Shot_2016-12-19_at_12.52.39.png) ### `/root/reviewing/enviroments/10013/terminal` ![Screen_Shot_2016-12-15_at_02.35.52](/uploads/1bb77b7e2de2c657ae3bda62dc4f0970/Screen_Shot_2016-12-15_at_02.35.52.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - 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 #22864 #22958 * Alternative to, and somewhat based on, !6770 * Depends on https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/83 See merge request !7690
| * | | | | Add terminal UI and controller actionsFatih Acet2016-12-192-0/+60
| | | | | |
* | | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-202-3/+43
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| * | | | | Fix failuresKamil Trzcinski2016-12-181-1/+1
| | | | | |
| * | | | | Fix spec failuresKamil Trzcinski2016-12-181-2/+2
| | | | | |
| * | | | | Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-181-0/+48
| | |_|/ / | |/| | | | | | | | | | | | | Added tests
* | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Admin Appearance spinach feature to RSpec Part of #23036 See merge request !8063
| * | | | | Move Admin Appearance spinach feature to rspecjurre2016-12-191-0/+76
| | | | | |
* | | | | | Merge branch 'pipeline-build-hitbox' into 'master' Annabel Dunstone Gray2016-12-191-18/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CI badge hitboxes better match container ## What does this MR do? Makes the Pipeline graph badge hitboxes accurately match their containers. Currently, there's an issue where the badge highlights, as though, it's clickable, but clicking it does nothing: ![before](/uploads/668f841c640bc586044c89bed9f1e1e9/before.gif) This is due to the `<a>` and `<button>` elements being padded into the parent elements. So, the parent would react to a cursor, but the cursor wouldn't be on the `<a>`/`<button>` yet. ![before-hitbox](/uploads/6ebaaa4be1096fbfc37f8d73da492c7b/before-hitbox.png) ## Are there points in the code the reviewer needs to double check? Maybe the tests? I kept the style changes as minimal as possible. ## Why was this MR needed? I was annoyed every time I clicked on a badge that I was _clearly on_ (it highlighted), but nothing happened. If I found it irritating, perhaps someone else did too. ## Screenshots (if relevant) How it behaves in the PR: ![finished](/uploads/c26fabe37ccf17f171f40b48522702b2/finished.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [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 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 #25547 See merge request !8156
| * | | | | Make CI badge hitboxes better match containerMitchell Hentges2016-12-191-18/+15
| |/ / / /
* | | | | Move admin broadcast messages spinach feature to rspecjurre2016-12-191-0/+51
|/ / / /
* | | | Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin labels spinach test to RSpec Part of #23036 See merge request !8166
| * | | | Move admin labels spinach test to rspecSemyon Pupkov2016-12-191-0/+99
| | |_|/ | |/| | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | 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 branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-191-0/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow to use Dockerfile templates See merge request !7247
| * \ \ \ Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18105-1681/+3883
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Refactored JSLuke "Jared" Bennett2016-11-081-0/+30
| | | | | | | | | | | | | | | | | | | | Added spec
* | | | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin application spinach test to RSpec Part of #23036 See merge request !8140
| * | | | | Move admin application spinach test to rspecSemyon Pupkov2016-12-171-0/+36
| | |/ / / | |/| | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | Move admin deploy keys spinach test to rspecSemyon Pupkov2016-12-171-0/+29
|/ / / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-172-0/+129
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaner merge commit messages Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23462 See merge request !7722
| * | | | Change closes issues reference text on MergeRequest#merge_commit_message to ↵Gabriel Gizotti2016-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | match existing text generated by the system
| * | | | add feature specs to test toggling of merge commit message between message ↵Gabriel Gizotti2016-12-162-3/+75
| | | | | | | | | | | | | | | | | | | | with description and without
| * | | | Add feature spec to verify all 4 different states of closing issues message ↵Gabriel Gizotti2016-12-161-0/+57
| | | | | | | | | | | | | | | | | | | | on Merge Request show page.
* | | | | Improve test for sort dropdown on members pageNur Rony2016-12-162-0/+18
| | | | |
* | | | | Use factories to create project/group membership on specsDouglas Barbosa Alexandre2016-12-162-4/+4
| | | | |
* | | | | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-162-0/+14
| | | | |
* | | | | Add feature spec for sort functionality on group/project members listDouglas Barbosa Alexandre2016-12-162-0/+164
| | | | |
* | | | | Merge branch '18435-autocomplete-is-not-performant' into 'master' Fatih Acet2016-12-162-5/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-161-14/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add a doorkeeper scope suitable for authentication" ## What does this MR do? - Add a single new scope (in addition to the `api` scope we've had) - `read_user` - Allow creating OAuth applications and Personal access tokens with a scope selected - Enforce scopes in the API ## What are the relevant issue numbers? - Closes #20492 - EE counterpart for this MR: gitlab-org/gitlab-ee!946 See merge request !5951
| * | | | | Add a controller spec for personal access tokens.Timothy Andrew2016-12-161-40/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the existing feature spec into both feature and controller specs. Feature specs assert on browser DOM, and controller specs assert on database state.
| * | | | | Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-161-0/+26
| | |/ / / | |/| | |
* | | | | Merge branch '22604-manual-actions' into 'master' Grzegorz Bizon2016-12-162-1/+86
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix broken test22604-manual-actionsFilipa Lacerda2016-12-161-1/+1
| | | | |
| * | | | Merge branch 'master' into 22604-manual-actionsFilipa Lacerda2016-12-163-1/+139
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) Fix spec/features/admin/admin_active_tab_spec.rb Fix eslint errors Don't open Asciidoc module twice Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip] Unify margin widths Add $CI_ENVIRONMENT_NAME and $CI_ENVIRONMENT_SLUG Add Okta authentication documentation Create environments when the build referencing them is created Add an environment slug Make the index on environment name and project id unique, fixing up any duplicates Rename `issue create` slash command to `issue new` Add changelog for !7850. Update Mattermost slash commands docs to explain how to create a newline and use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element Improve `issue create …` slash command with user input keys to create a newline in chat clients. Add explicit status test, feedback: Don't call anything on a block, use simple if Use described_class and update description Also use latest_status, feedback: Fixed bug with +1 not autocompleting added changelog entry ...
| * | | | Changes after reviewFilipa Lacerda2016-12-151-34/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes after review Fix tooltip title Remove unneeded string interpolation
| * | | | Merge branch 'master' into '22604-manual-actions'Filipa Lacerda2016-12-153-5/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | # Conflicts: # app/assets/stylesheets/pages/pipelines.scss
| * | | | Fix testsFilipa Lacerda2016-12-151-10/+29
| | | | |
| * | | | Fix broken testsFilipa Lacerda2016-12-141-3/+3
| | | | |
| * | | | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-1416-33/+249
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-094-5/+205
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-162-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost Notifications Service ## What does this MR do? closes #22269 ## Screenshots ![mattermost](/uploads/de71c121f544a91305b6dfa6dc4c5738/mattermost.png) ![slack](/uploads/081d75d49239319d94332abda214fb98/slack.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [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) See merge request !7764