summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ↵64950-move-download-csv-button-functionality-in-metrics-dashboard-cards-into-the-dropdownAchilleas Pipinellis2019-08-21408-7603/+7110
|\ | | | | | | 64950-move-download-csv-button-functionality-in-metrics-dashboard-cards-into-the-dropdown
| * Merge branch ↵Achilleas Pipinellis2019-08-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | 'update-api-docs-remove-incorrect-group-vulnerabilities-reference' into 'master' Update api_resources docs - remove incorrect group vulnerabilities reference See merge request gitlab-org/gitlab-ce!31979
| | * Update api_resources docs - remove incorrect group vulnerabilities referenceupdate-api-docs-remove-incorrect-group-vulnerabilities-referenceLucas Charles2019-08-191-1/+1
| | |
| * | Merge branch '63372-award-emoji-services' into 'master'Grzegorz Bizon2019-08-2132-162/+700
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add service classes for mutating AwardEmoji Closes #63372 See merge request gitlab-org/gitlab-ce!29782
| | * | Improve specs for Issues and Notes controllers63372-award-emoji-servicesLuke Duncalfe2019-08-213-11/+57
| | | | | | | | | | | | | | | | | | | | | | | | This adds test that Todos are completed. https://gitlab.com/gitlab-org/gitlab-ce/issues/63372
| | * | Use AwardEmojis services in GraphQL mutationsLuke Duncalfe2019-08-215-40/+32
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/63372
| | * | Add service classes for mutating AwardEmojiLuke Duncalfe2019-08-2120-88/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding, destroying and toggling emoji previously lacked services and instead were performed through methods called on Awardable models. This led to inconsistencies where relevant todos would be marked as done only when emoji were awarded through our controllers, but not through the API. Todos could also be marked as done when an emoji was being removed. Behaviour changes - Awarding emoji through the API will now mark a relevant Todo as done - Toggling an emoji off (destroying it) through our controllers will no longer mark a relevant Todo as done Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63372
| | * | Renaming AwardedEmojiFinder to a ServiceLuke Duncalfe2019-08-214-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finder class acts more as a service, as it only returns mapped data. Renaming this class allows us to create a new AwardEmojiFinder without the ambiguity of there being two similarly-named finders. https://gitlab.com/gitlab-org/gitlab-ce/issues/63372
| * | | Merge branch 'winh-frontend-testing-levels-diagrams-docs' into 'master'Kushal Pandya2019-08-211-0/+152
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add diagrams for frontend testing levels (docs) See merge request gitlab-org/gitlab-ce!31999
| | * | | Add diagrams for frontend testing levels (docs)Winnie Hellmann2019-08-211-0/+152
| |/ / /
| * | | Merge branch '56130-deployed_at' into 'master'Thong Kuah2019-08-215-6/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Replace finished_at with deployed_at for the internal API Deployment entity See merge request gitlab-org/gitlab-ce!32000
| | * | | Replace finished_at with deployed_at for Deployment entity56130-deployed_atKrasimir Angelov2019-08-205-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of `finished_at` attribute use `deployed_at` methods which also takes into account the deployment status. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/56130.
| * | | | Merge branch 'docs-jonfen-contribution' into 'master'Achilleas Pipinellis2019-08-211-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update container_registry.md to handle CA Bundle certs and validation See merge request gitlab-org/gitlab-ce!31891
| | * | | | Update container_registry.md to handle CA Bundle certs and validationMarcel Amirault2019-08-211-0/+9
| |/ / / /
| * | | | Merge branch 'docs-update-request-access' into 'master'Achilleas Pipinellis2019-08-213-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Refresh project request access screenshots See merge request gitlab-org/gitlab-ce!31880
| | * | | | Docs: Refresh project request access screenshotsTristan Williams2019-08-213-0/+0
| |/ / / /
| * | | | Merge branch 'docs-update-start-using-git.md' into 'master'Achilleas Pipinellis2019-08-211-9/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update doc/gitlab-basics/start-using-git.md See merge request gitlab-org/gitlab-ce!31793
| | * | | | Update doc/gitlab-basics/start-using-git.mdAfzaal Ahmad Zeeshan2019-08-211-9/+12
| |/ / / /
| * | | | Merge branch '62971-embed-specific-metrics-chart-in-issue-docs' into 'master'Achilleas Pipinellis2019-08-212-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Embed specific metrics chart in issue docs See merge request gitlab-org/gitlab-ce!31900
| | * | | | Adds specific metric styles and propSimon Knox2019-08-212-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds the styles for displaying a single chart next to another one when embedding them in an issue.
| * | | | Merge branch 'remove-inline-js-in-links' into 'master'Kushal Pandya2019-08-216-8/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove inline JS in links See merge request gitlab-org/gitlab-ce!31842
| | * | | | Remove inline JS in linksremove-inline-js-in-linksHeinrich Lee Yu2019-08-216-8/+12
| | | |/ / | | |/| | | | | | | | | | | | Changes these to use unobtrusive JS
| * | | | Merge branch '59786-show-renamed-file-in-mr' into 'master'Filipa Lacerda2019-08-213-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix to show renamed file in mr Closes #59786 See merge request gitlab-org/gitlab-ce!31888
| | * | | | Fix to show renamed file in mrSamantha Ming2019-08-213-2/+7
| |/ / / /
| * | | | Merge branch 'winh-prevent-multiple-recaptcha-modals' into 'master'Kushal Pandya2019-08-212-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Throw error for multiple RecaptchaModal instances See merge request gitlab-org/gitlab-ce!32017
| | * | | | Throw error for multiple RecaptchaModal instancesWinnie Hellmann2019-08-212-0/+9
| |/ / / /
| * | | | Merge branch ↵Filipa Lacerda2019-08-212-2/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-port-12918-metrics-dashboard-alerting-menu-unavailable-when-additional-panel-types-is-enabled-2' into 'master' CE Port: Use EE panel type to display alert menu correctly in dashboards See merge request gitlab-org/gitlab-ce!31873
| | * | | | CE Port: Use EE panel type to display alert menu correctly in dashboardsMiguel Rincon2019-08-212-2/+14
| |/ / / /
| * | | | Merge branch 'winh-autosave_spec-sync' into 'master'Kushal Pandya2019-08-211-4/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make native event test in autosave_spec.js synchronous See merge request gitlab-org/gitlab-ce!32003
| | * | | | Make native event test in autosave_spec.js synchronousWinnie Hellmann2019-08-211-4/+7
| |/ / / /
| * | | | Merge branch '46299-wiki-page-creation' into 'master'Filipa Lacerda2019-08-2118-211/+287
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove wiki page slug dialog step when creating wiki page See merge request gitlab-org/gitlab-ce!31362
| | * | | | New wiki page redirects user to random slug46299-wiki-page-creationLuke Duncalfe2019-08-2118-211/+287
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we asked a user to enter a new slug before taking them to the Create Page page. As a UX improvement, we now take them to a randomly generated URI so they can begin creating their new page. https://gitlab.com/gitlab-org/gitlab-ce/issues/46299
| * | | | Merge branch '65427-improve-system-notes-for-zoom-links' into 'master'Thong Kuah2019-08-215-12/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve system notes for Zoom links" Closes #65427 See merge request gitlab-org/gitlab-ce!31410
| | * | | | Improve system notes for Zoom links65427-improve-system-notes-for-zoom-linksJacopo2019-08-175-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes: @user a Zoom call was added to this issue into: @user added a Zoom call to this issue Same concept appleis for "removed"
| * | | | | Merge branch 'clarify-only-except-docs' into 'master'Evan Read2019-08-211-1/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an example to doumentation for using multiple build policies with only: and except: See merge request gitlab-org/gitlab-ce!31983
| | * | | | | Added an example to doumentation for using multiple build policies with ↵drew2019-08-211-1/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | only: and except:
| * | | | | Merge branch 'docs-k8s-caps' into 'master'Evan Read2019-08-211-14/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update capitalization in k8s cheat sheet Closes #65816 See merge request gitlab-org/gitlab-ce!32036
| | * | | | | Update capitalization in k8s cheat sheetMarcel Amirault2019-08-211-14/+14
| |/ / / / /
| * | | | | Merge branch 'docs-patch-71' into 'master'Achilleas Pipinellis2019-08-212-2/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve details about when rebase button is offered See merge request gitlab-org/gitlab-ce!29644
| | * | | | | Improve details about when rebase button is offeredBen Bodenmiller2019-08-212-2/+8
| |/ / / / /
| * | | | | Merge branch 'docs/pipelines-gitaly-version-removal' into 'master'Evan Read2019-08-211-3/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Gitaly version in the docs See merge request gitlab-org/gitlab-ce!32006
| | * | | | | Remove Gitaly version in the docsdocs/pipelines-gitaly-version-removalZeger-Jan van de Weg2019-08-201-3/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's very hard for end user to know what version of Gitaly is running, and they should not have to care about this detail either. Gitaly 1.21.0 was released before 11.9 was tagged, so it's an unsupported version too. This change removes the reference.
| * | | | | Merge branch 'zm-rephrase-ci-docs' into 'master'Evan Read2019-08-212-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update grammar in DAG docs See merge request gitlab-org/gitlab-ce!32021
| | * | | | | Update grammar in DAG docszm-rephrase-ci-docsZeff Morgan2019-08-202-3/+3
| | | | | | |
| * | | | | | Merge branch 'winh-frontend-testing-code-blocks-docs' into 'master'Evan Read2019-08-211-8/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code blocks in frontend testing guide (docs) See merge request gitlab-org/gitlab-ce!32002
| | * | | | | | Fix code blocks in frontend testing guide (docs)Winnie Hellmann2019-08-211-8/+8
| |/ / / / / /
| * | | | | | Merge branch 'docs-fix-soft-deletion' into 'master'Evan Read2019-08-214-4/+4
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Fix outdated references to soft deletion See merge request gitlab-org/gitlab-ce!31982
| | * | | | | Fix outdated references to soft deletiondocs-fix-soft-deletionMarkus Koller2019-08-194-4/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | We stopped using soft deletion for issues and merge requests in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15789, and for boards we apparently never used it.
| * | | | | Merge branch 'master' into 'master'Paul Slaughter2019-08-203-5/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove margin from user header buttons Closes #57966 See merge request gitlab-org/gitlab-ce!30878
| | * | | | | Remove margin from user header buttonsLucy Fox2019-08-203-5/+9
| |/ / / / /