summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Make Danger consider .md files as documentation filesconsider-md-files-as-doc-in-danger-checkRémy Coutable2019-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'winh-jest-require-assertions' into 'master'Mike Greiling2019-08-211-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that each Jest test contains an assertion See merge request gitlab-org/gitlab-ce!31967
| * | | | | | | | | Make sure that each Jest test contains an assertionWinnie Hellmann2019-08-211-0/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-group-managed-accounts' into 'master'Achilleas Pipinellis2019-08-211-0/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation MVC for group managed accounts Closes gitlab-ee#12526 See merge request gitlab-org/gitlab-ce!30876
| * | | | | | | | | Documentation MVC for group managed accountsJeremy Watson2019-08-211-0/+19
|/ / / / / / / / /
* | | | | | | | | Merge branch 'two-factor-auth-docs' into 'master'Achilleas Pipinellis2019-08-211-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add Sailfish app to 2fa Closes #66316 See merge request gitlab-org/gitlab-ce!32049
| * | | | | | | | | Docs: Add Sailfish app to 2faStefan Schmalzhaf2019-08-211-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '66331-html-code-shown-in-merge-request' into 'master'Paul Slaughter2019-08-213-0/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "HTML code shown in merge request" Closes #66331 See merge request gitlab-org/gitlab-ce!32032
| * | | | | | | | | Resolve "HTML code shown in merge request"Ezekiel Kigbo2019-08-213-0/+24
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes double escaped text in `mr_widget_rebase.vue`
* | | | | | | | | Merge branch 'docs-request-profiling-tag' into 'master'Achilleas Pipinellis2019-08-214-32/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 4 kramdown warnings See merge request gitlab-org/gitlab-ce!32040
| * | | | | | | | | Fix markdown causing kramdown warningsMarcel Amirault2019-08-214-32/+31
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of square brackets can cause kramdown warnings, as well as angle brackets, so they should be removed or put in backticks
* | | | | | | | | Merge branch '65412-add-support-for-line-charts' into 'master'Kushal Pandya2019-08-219-10/+711
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create component to display area and line charts in monitor dashboards Closes #65412 See merge request gitlab-org/gitlab-ce!31639
| * | | | | | | | This commit adds a new time series componentMiguel Rincon2019-08-219-10/+711
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a time series component for line and area charts. Displays new charts in the dashboard. - Use dynamic components for line/area swapping - Add new line charts to dashboard in 2 panels
* | | | | | | | Merge branch 'docs/clarify-new-text' into 'master'Achilleas Pipinellis2019-08-211-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make text clearer See merge request gitlab-org/gitlab-ce!32042
| * | | | | | | | Make text clearerEvan Read2019-08-211-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch ↵Achilleas Pipinellis2019-08-212-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64950-move-download-csv-button-functionality-in-metrics-dashboard-cards-into-the-dropdown' into 'master' Add docs for csv download Closes #66291 See merge request gitlab-org/gitlab-ce!31870
| * | | | | | | | Add docs for csv downloadLaura Montemayor2019-08-212-0/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-staging-67-fix-add-project-member-spec' into 'master'Sanad Liaquat2019-08-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix add project member spec Closes gitlab-org/quality/staging#67 See merge request gitlab-org/gitlab-ce!31974
| * | | | | | | | Match space or newline after usernameqa-staging-67-fix-add-project-member-specSanad Liaquat2019-08-201-1/+1
| | | | | | | | |
| * | | | | | | | Fix add project member specSanad Liaquat2019-08-191-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-muli-gitaly' into 'master'Achilleas Pipinellis2019-08-211-21/+61
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify how to setup and use multiple Gitaly servers Closes omnibus-gitlab#3994 See merge request gitlab-org/gitlab-ce!31929
| * | | | | | | | | Clarify how to setup and use multiple Gitaly serversBen Bodenmiller2019-08-211-21/+61
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-22058-improve-ux-multi-assignees-in-mr' into 'master'Rémy Coutable2019-08-2124-408/+1057
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UX multi assigness in MR See merge request gitlab-org/gitlab-ce!31545
| * | | | | | | | | Fix tooltip alignment issue caused by flex-basisce-22058-improve-ux-multi-assignees-in-mrPaul Slaughter2019-08-201-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Context:** https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14851#note_205954645
| * | | | | | | | | Apply patch and update spec per MR commentsSamantha Ming2019-08-207-132/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use wrapper instead of global Vue object - Use vue utils helper method - Remove redundant spec tests
| * | | | | | | | | Fix comments related to BE partIgor Drozdov2019-08-202-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Edit commit messge body to fix "danger-review"
| * | | | | | | | | Fix `require` typo to `required`Paul Slaughter2019-08-206-6/+6
| | | | | | | | | |
| * | | | | | | | | Improve UX multi assigness in MRSamantha Ming2019-08-2022-406/+1077
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add merge warning on avatar in: - open view assigness - collapsed view assigness - dropdown (search) view assigness Add can_merge option to MR sidebar entity
| * | | | | | | | | Add CE changelog for assignee style changePaul Slaughter2019-08-201-0/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'georgekoltsov/18720-persistent-dashboard-sort' into 'master'Kamil Trzciński2019-08-2116-170/+313
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting projects - Persist last choice See merge request gitlab-org/gitlab-ce!31669
| * | | | | | | | | | Add SortingPreference concernGeorge Koltsov2019-08-2116-170/+313
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting preference functionality has been extracted from `IssuableCollections` to a new `SortingPreference` concern in order to reuse this functionality in projects (and groups in the future).
* | | | | | | | | | Merge branch 'docs-ssl-clarification' into 'master'Achilleas Pipinellis2019-08-211-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add let's encrypt omnibus guide link Closes #57934 See merge request gitlab-org/gitlab-ce!31301
| * | | | | | | | | | Add let's encrypt omnibus guide linkMarcel Amirault2019-08-211-1/+5
|/ / / / / / / / / /
* | | | | | | | | | 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
|/ / / / / / / / / / / /