summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
* Speed up project snippet security request specsrs-project-snippet-security-specsRobert Speicher2016-12-023-204/+168
| | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7813
* Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-012-59/+154
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines tabs ## What does this MR do? Changes the URL when the builds tab is clicked making it possible to be shared. 1. Adds a standard way to handle linked tabs: * This behaviour is already present in the merge requests, commit and user `show` page. * This MR introduces a reusable way to accomplish this behaviour for pages with static content. 2. Adds test: * For the linked tabs reusable class * For the pipelines tabs ## Why was this MR needed? To allow having a sharable URL that represented the opened tab ![tabs](/uploads/91e663c12c6e9ac46a17aa3a9489dc72/tabs.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 - [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 #24814 See merge request !7709
| * Fixes after reviewFilipa Lacerda2016-11-301-19/+3
| | | | | | | | | | | | Fix pipelines tests Fix rubocop
| * Adds .matches polyfillFilipa Lacerda2016-11-302-156/+170
| | | | | | | | | | Moves matches poly to the correct file Divides pipelines index and show tests in order to be able to test with JS
| * Adds tests for builds url and tabs behaviourFilipa Lacerda2016-11-301-0/+86
| |
| * Adds tests for tabs in the rspec for pipelinesFilipa Lacerda2016-11-301-1/+5
| | | | | | | | | | | | | | | | Adds tests for the Linked Tabs class Removes event listener Adds builds
| * Pipelines tabsFilipa Lacerda2016-11-301-0/+7
| |
* | Merge branch ↵Fatih Acet2016-12-011-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24281-issue-merge-request-sidebar-subscribe-button-style-improvement' into 'master' Remove the help text under the sidebar subscribe button and style it inline ## What does this MR do? Remove the help text under the sidebar subscribe button and style it inline ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Current help text is over obvious and pushes references too far down. Also the subscribe button is now consistently styled and not a complete block button anymore. approved by @awhildy ## Screenshots (if relevant) before: ![image](/uploads/0c9543d2bf184a73b65773caa5f9fc62/image.png) after: ![image](/uploads/765338823376267427f4a16737e39998/image.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 - [ ] 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 #24281 See merge request !7389
| * | rewrite subscription javascript to accomodate new designMike Greiling2016-11-301-2/+2
| |/
* | Merge branch '18546-update-wiki-page-design' into 'master' Fatih Acet2016-12-012-8/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "missing design for wiki page" ### To Do: - [x] Move page navigation from sub-menu to sidebar menu - [x] Update wiki page header - [x] Update wiki edit page actions and header - [x] Update `Git access` page design - [ ] ~~Add search to sidebar navigation~~ ### Screen Shots: #### `@media (min-width: $screen-lg)` ![Screen_Shot_2016-11-16_at_12.25.47_PM](/uploads/2efc59639ac53d69808e78a8ba65fcbf/Screen_Shot_2016-11-16_at_12.25.47_PM.png) ![Screen_Shot_2016-11-16_at_12.25.36_PM](/uploads/bb7e93558335edf4216082cc1ac3f8f5/Screen_Shot_2016-11-16_at_12.25.36_PM.png) ![Screen_Shot_2016-11-16_at_12.26.43_PM](/uploads/c2dce7cff05680b9a03438ec7d9967b4/Screen_Shot_2016-11-16_at_12.26.43_PM.png) ![Screen_Shot_2016-11-16_at_12.26.05_PM](/uploads/7dbae25bfc93fb2f01cd231db0cb47d3/Screen_Shot_2016-11-16_at_12.26.05_PM.png) #### `@media (min-width: $screen-md)` ![Screen_Shot_2016-11-16_at_12.28.18_PM](/uploads/4fdcc8c88c38093ea5a4fe0b22b79acf/Screen_Shot_2016-11-16_at_12.28.18_PM.png) ![Screen_Shot_2016-11-16_at_12.28.21_PM](/uploads/ce84a51fdc0623b2b192d8334c2c2f6d/Screen_Shot_2016-11-16_at_12.28.21_PM.png) #### `@media (min-width: $screen-sm)` ![Screen_Shot_2016-11-16_at_12.28.05_PM](/uploads/cf612a36259c248ca597a0850546fe75/Screen_Shot_2016-11-16_at_12.28.05_PM.png) ![Screen_Shot_2016-11-16_at_12.28.08_PM](/uploads/ae4374f9968c1cc064242fde3ad0e214/Screen_Shot_2016-11-16_at_12.28.08_PM.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] 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 #18546 See merge request !7429
| * | fix tests broken by new wiki page designMike Greiling2016-11-302-8/+8
| |/
* | Fix URL rewritting in the Help section25199-fix-broken-urls-in-help-pageRémy Coutable2016-12-011-2/+11
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Speed up Group security access specsrs-group-security-spec-speedRobert Speicher2016-11-303-204/+165
| | | | This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969
* Merge branch '25002-sentence-case-dashboard-tabs' into 'master' Annabel Dunstone Gray2016-11-301-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Changes project dashboard tabs to sentence casing Changes the nav tab titles on the project dashboard page (```https://gitlab.com/dashboard/projects```) from title casing to sentence casing. Before: ![Screen_Shot_2016-11-26_at_11.17.23_PM](/uploads/a31c951cf83f7670acee778db9337be5/Screen_Shot_2016-11-26_at_11.17.23_PM.png) After: ![Screen_Shot_2016-11-26_at_11.17.39_PM](/uploads/a0cb5f6b6771e6f5149750ea1e7beb02/Screen_Shot_2016-11-26_at_11.17.39_PM.png) Closes #25002 See merge request !7774
| * Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90acRyan Harris2016-11-291-1/+1
| |
* | Merge branch 'hide-project-variables' into 'master' Fatih Acet2016-11-291-0/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide project variables values by default Add a button to reveal/hide the values to help prevent accidental disclosure of sensitive information from wandering on a page. ![hide-vars](/uploads/5b5eeef9b4650776b529b780998bbb1b/hide-vars.gif) Closes #21358 See merge request !7731
| * | Add spec for hiding variables and remove the need for ES6 SymbolStan Hu2016-11-241-0/+25
| | |
* | | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-281-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix information disclosure in `Projects::BlobController#update` It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that. - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) https://gitlab.com/gitlab-org/gitlab-ce/issues/22869 See merge request !2023
* | | Ensure user is authenticated to create a new snippet25026-authenticate-user-for-new-snippetRémy Coutable2016-11-281-0/+20
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'rs-project-security-spec-speed' into 'master' Rémy Coutable2016-11-283-758/+719
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up Project security access specs Prior, every single test was creating four `ProjectMember` objects, each of which created one `User` record, even though each test only used _one_ of those Users, if any. Now each test only creates the single user record it needs, if it needs one. This shaves minutes off of each spec file changed here. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7779
| * | | Speed up Project security access specsRobert Speicher2016-11-283-758/+719
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Prior, every single test was creating four `ProjectMember` objects, each of which created one `User` record, even though each test only used _one_ of those Users, if any. Now each test only creates the single user record it needs, if it needs one. This shaves minutes off of each spec file changed here.
* | | Merge branch 'fix-dead-help-link' into 'master' Rémy Coutable2016-11-281-0/+24
|\ \ \ | |/ / |/| | | | | | | | Fix a broken link and avoid potential creation of future broken links on the help page. See merge request !7582
| * | Check that both '/help' and '/help/' URLs have the same behaviourDavid Wagner2016-11-251-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | The links in the help page may be modified. This new test checks that URLs in this page are absolute and do not depend on the presence of a trailing slash in the URL. Signed-off-by: David Wagner <david@marvid.fr>
* | | Merge branch 'fix-cancelling-pipelines' into 'master' Kamil Trzciński2016-11-251-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve how we could cancel pipelines: Improve how we could cancel pipelines: * Introduce `HasStatus.cancelable` which we might be able to cancel * Cancel and check upon `cancelable` * Also cancel on `CommitStatus` rather than just `Ci::Build` Fixes #23635 Fixes #17845 See merge request !7508
| * \ \ Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-224-8/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (133 commits) Restructure steps for MM slash commands service Add Changelog entry for CI linter validation fix Fix entry lookup in CI config inheritance rules Extend specs for global ci configuration entry Remove unnecessary require_relative calls from service classes Use single quote for strings Ue svg from SVGs object Dont trigger CI builds [ci skip] Revert "Test only migrations" Add custom copy for each empty stage Refactor Mattermost slash commands docs Fetch only one revision Highlight nav item on hover Test only migrations Fix migration paths tests Scroll CA stage panel on mobile Fix CSS declaration administer to administrator Move SVGs to JS objects for easy reuse Improve deploy command message ...
| * \ \ \ Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-2111-229/+333
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (302 commits) Fix a wrong "The build for this merge request failed" message Add documentation about todos and failed builds Add Changelog entry for failed builds todos fix Do not create TODO when build is allowed to fail Fix 404 on some group pages when name contains dot Grapify the users API Remove duplicate sidekiq throttling parameters Fix regression in Merge request form Fix wrong link Fix test Fix broken test Changes for stop url to path fix typo in gitlab_flow.md ('munch'->'much') Fix spec Backport some changes done from Time Tracking feature in EE. Use build instead create in BroadcastMessage model spec Try to fix tests Remove unnecessary self from user model Expose stop_path for environment to not construct that in frontend Bring back the `commit_url` as it's used by CycleAnalytics ...
| * | | | | Add when cancelling for external jobs, feedback:Lin Jen-Shin2016-11-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7508#note_18622182
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-186-16/+267
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (162 commits) Grapify the repository API Fix wrong link URL Add note pointing to limitations section in environments.md Clarify the limitation for special chars is for Review Apps Change order of limitations list in environments.md Add an example of invalid characters to branches for review apps Grammar fix in environments.md: s/base/basis Add changelog entry for #24276 / !7500 Allow registering users where the username contains dots (.). bump rouge to 2.0.7 Fix indentation Update copy.md with issue guideline updates and merge request guidelines Refactor github import to reduce number of API calls Fix missing URL from environments docs Check all namespaces on validation of new username. Allow sorting groups in API Use the public CE repo URL instead of the one used in the runner Fix typos Fix wrong changelog item Add missing item for 8.13.6 ...
| * | | | | | Improve how we could cancel pipelines:Lin Jen-Shin2016-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce `HasStatus.cancelable` which we might be able to cancel * Cancel and check upon `cancelable` * Also cancel on `CommitStatus` rather than just `Ci::Build` Fixes #23635 Fixes #17845
* | | | | | | Merge branch 'autocomplete-space-prefix' into 'master' Fatih Acet2016-11-251-0/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow GFM autocomplete to be trigger without the preceding space ## What does this MR do? Gives the ability to GFM autocomplete to be trigger even if there is no preceding space. I've taken the regex from the at.js plugin & tweaked it to allow the leading character to be a special character. ## What are the relevant issue numbers? Closes #19975 ## Screenshots (if relevant) ![Screen_Shot_2016-07-21_at_14.41.34](/uploads/19684ba286baeedb754e7457945480a8/Screen_Shot_2016-07-21_at_14.41.34.png)![Screen_Shot_2016-07-21_at_14.41.40](/uploads/a77349bce599ae93b4bcddd355087f5c/Screen_Shot_2016-07-21_at_14.41.40.png)![Screen_Shot_2016-07-21_at_14.41.46](/uploads/c35df17b678b24b73c94b181f0784188/Screen_Shot_2016-07-21_at_14.41.46.png) See merge request !5395
| * \ \ \ \ \ \ Merge branch 'master' into autocomplete-space-prefixautocomplete-space-prefixPhil Hughes2016-11-2443-353/+1100
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Tests fixPhil Hughes2016-11-141-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' into autocomplete-space-prefixPhil Hughes2016-11-11101-805/+4948
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into autocomplete-space-prefixPhil Hughes2016-08-3083-333/+3328
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Correctly checks for character before GFM input charPhil Hughes2016-07-211-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It must not be letter or number to work
| * | | | | | | | | Allow GFM autocomplete to be trigger without the preceding spacePhil Hughes2016-07-211-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19975
* | | | | | | | | | Merge branch 'issue_24748' into 'master' Fatih Acet2016-11-251-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix title case to sentence case in "Add Todo" ## What does this MR do? Implements sentence case for `Add Todo` ## Are there points in the code the reviewer needs to double check? I changed the images used in the file `doc/workflow/todos.md` to show the new look. ## Why was this MR needed? #24748 ## Screenshots (if relevant) Before ![Screen_Shot_2016-11-21_at_12.03.21_PM](/uploads/225abe2901aacccea697596853bdc52c/Screen_Shot_2016-11-21_at_12.03.21_PM.png) ![Screen_Shot_2016-11-21_at_11.58.17_AM](/uploads/3a5997eb6bb037f1c581d9925fa288ce/Screen_Shot_2016-11-21_at_11.58.17_AM.png) After ![Screen_Shot_2016-11-21_at_12.03.38_PM](/uploads/3be4d58e5adaa10fab759f8726a4d257/Screen_Shot_2016-11-21_at_12.03.38_PM.png) ![Screen_Shot_2016-11-21_at_11.58.37_AM](/uploads/016cdb32cb1e87e9e3cfd89309b53a4a/Screen_Shot_2016-11-21_at_11.58.37_AM.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) - [ ] 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) - [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? #24748 See merge request !7724
| * | | | | | | | | | Fix title case to sentence caseLuis Alonso Chavez Armendariz2016-11-231-4/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rephrase-system-notes' into 'master' Robert Speicher2016-11-254-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rephrase some system notes to be compatible with new system note style See merge request !7692
| * | | | | | | | | | | Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-244-7/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '24780-show-last-updated-or-resolved-in-mr-discussion' into ↵Fatih Acet2016-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' resolves updated and resolved status is not showing ## What does this MR do? This MR fixes #24780 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MRs removes some important information as par suggested design in #19797. it restores that information ## Screenshots (if relevant) **Before:** ![before](/uploads/a93091e783de3e550a07ddbc1fa8085a/before.png) **After:** ![after](/uploads/ceb7f64a6f20155abcf6ea49d4b8059e/after.png) ## 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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24780 See merge request !7655
| * | | | | | | | | | | | resloves failed rspec test24780-show-last-updated-or-resolved-in-mr-discussionNur Rony2016-11-231-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-241-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin spam spinach test to RSpec See merge request !7708
| * | | | | | | | | | | Move admin spam spinach test to RspecSemyon Pupkov2016-11-231-0/+22
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | | | | | Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-241-6/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7691
| * | | | | | | | | | | Move admin abuse report spinach test to rspecSemyon Pupkov2016-11-231-6/+10
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | | | | | Merge branch 'simplify-create-new-list-issue-boards' into 'master' Annabel Dunstone Gray2016-11-241-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify copy on "Create a new list" dropdown in Issue Boards ## What does this MR do? It changes the "Create new list" text to simply "Add list". It also describes the operation in a more concise way. It was suggested in #24659. ## Are there points in the code the reviewer needs to double check? Although I refactored references to the name of the button to reflect the new text, I left part of the documentation unmodified: File: `doc/user/project/issue_board.md` ``` In short, here's a list of actions you can take in an Issue Board: - [Create a new list](#creating-a-new-list). - [Delete an existing list](#deleting-a-list). ``` because I was not sure if changing those was necessary. Additionally, I replaced every occurrence of `click_button 'Create new list'` with `click_button 'Add list'`in the spec. I'm not sure if that causes any change in behavior as I am not sure if there are any hooks to the previous name, explicitly. File: `spec/features/boards/boards_spec.rb` ## Why was this MR needed? It is an improvement, as suggested in #24659 ## Screenshots (if relevant) **Before:** ![before](/uploads/cffd30b0e9a21d16bc25d046eb4ca42b/before.png) **After:** ![after2](/uploads/95b049e0c1c565c4ccd1a72a3f4be925/after2.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) - [ ] API support added - Tests - [ ] 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? #24659 See merge request !7605
| * | | | | | | | | | | Simplify copy on "Create a new list" dropdown in Issue Boardsvrod2016-11-231-8/+8
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'move-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-241-0/+24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7659
| * | | | | | | | | | Move abuse report spinach test to rspecSemyon Pupkov2016-11-231-0/+24
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036