summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Switch back to group_id as it's different from group_namegy-perf-project-fixGrant Young2019-06-281-4/+4
|
* Remove erroneously added pp callGrant Young2019-06-281-1/+0
| | | | was added by mistake
* Fix create_project in generate_perf_testdata to use correct group_nameGrant Young2019-06-281-5/+6
|
* Fix incorrect reaction placement in commit diff discussionSamantha Ming2019-06-273-1/+22
|
* Merge branch 'update-toast-styling' into 'master'Kushal Pandya2019-06-271-2/+2
|\ | | | | | | | | Update toast action selector See merge request gitlab-org/gitlab-ce!30024
| * Update action selectorJacques Erasmus2019-06-271-2/+2
|/ | | | Updated the toast action selector to `first-of-type` instead
* Merge branch 'qa-ml-unquarantine-add-file-template-tests' into 'master'Ramya Authappan2019-06-272-4/+2
|\ | | | | | | | | Unquarantine fixed tests See merge request gitlab-org/gitlab-ce!30109
| * Unquarantine fixed testsqa-ml-unquarantine-add-file-template-testsMark Lapierre2019-06-272-4/+2
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28915
* | Merge branch 'mh/related-issues-design-ce' into 'master'Kushal Pandya2019-06-274-93/+148
|\ \ | | | | | | | | | | | | | | | | | | Conform related issues/MRs card to design docs Closes #59594 and #61357 See merge request gitlab-org/gitlab-ce!29626
| * | Conform related issues/MRs card to design docsMartin Hanzel2019-06-274-93/+148
|/ /
* | Merge branch 'rs-ee-only-routes-2' into 'master'Lin Jen-Shin2019-06-277-7/+171
|\ \ | | | | | | | | | | | | CE-EE parity for routes See merge request gitlab-org/gitlab-ce!29994
| * | Delineate additional EE-only routesrs-ee-only-routes-2Robert Speicher2019-06-262-16/+29
| | |
| * | Copy routes from EERobert Speicher2019-06-266-7/+154
| | | | | | | | | | | | | | | This ensures all routes are defined in both CE and EE, with EE-specific routes being wrapped in `Gitlab.ee` blocks.
| * | Add Gitlab.ee methodRobert Speicher2019-06-261-0/+4
| | | | | | | | | | | | This method yields to the given block when the installation is EE.
* | | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-2719-42/+188
|\ \ \ | | | | | | | | | | | | | | | | Move Multiple Issue Boards for Projects to Core See merge request gitlab-org/gitlab-ce!29757
| * | | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-2619-42/+188
| | | | | | | | | | | | | | | | | | | | Refactor code to allow multiple issue boards management for projects in CE
* | | | Merge branch ↵Achilleas Pipinellis2019-06-274-55/+63
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '63588-follow-up-from-documentation-for-prometheus-service-discovery' into 'master' Add note to collect CONSUL_SERVER_NODES in HA docs Closes #63588 See merge request gitlab-org/gitlab-ce!29945
| * | | Add note to collect CONSUL_SERVER_NODES in HA docs63588-follow-up-from-documentation-for-prometheus-service-discoveryCindy Pallares2019-06-264-55/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several instances in our HA docs where an example of `Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z` is given, but this value isn't explicitly stated. It should be the IP addresses or DNS records of the Consul server nodes.
* | | | Merge branch 'docs/requirements_operating_system' into 'master'Evan Read2019-06-271-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clarified supported operating systems See merge request gitlab-org/gitlab-ce!30080
| * | | | Clarified supported operating systemsRussell Dickenson2019-06-271-6/+6
|/ / / /
* | | | Merge branch 'docs-markdown-link' into 'master'Evan Read2019-06-271-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix broken link in markdown doc See merge request gitlab-org/gitlab-ce!30106
| * | | | Fix broken link in markdown docMarcel Amirault2019-06-271-2/+0
|/ / / /
* | | | Merge branch 'docs-autodevops-updates' into 'master'Evan Read2019-06-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add zero downtime upgrade detail for production_replicas See merge request gitlab-org/gitlab-ce!29912
| * | | | Add zero downtime upgrade detail for production_replicasDaniel Gruesso2019-06-271-1/+1
|/ / / /
* | | | Merge branch 'patch-71' into 'master'Ray Paik2019-06-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | docs: Update README.md. Made a simple grammar fix. See merge request gitlab-org/gitlab-ce!30065
| * | | | Update README.md. Made a simple grammar fix.Rose Grissinger2019-06-261-1/+1
| | | | |
* | | | | Merge branch '61156-instance-level-cluster-pod-terminal-access' into 'master'Thong Kuah2019-06-277-89/+105
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instance-level cluster pod terminal access Closes #55489, #55488, #55487, and #61156 See merge request gitlab-org/gitlab-ce!28613
| * | | | | Move terminal construction logic to Environment61156-instance-level-cluster-pod-terminal-accessTiger2019-06-257-89/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables terminals for group and project level clusters. Previously there was no way to determine which project (and therefore kubernetes namespace) to connect to, moving this logic onto Environment means the assoicated project can be used to look up the correct namespace.
* | | | | | Merge branch 'docs-gfm-cleanup' into 'master'Evan Read2019-06-276-675/+866
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: GFM Doc Refactor Closes #12681, #52394, #56148, #58676, #50138, and #52250 See merge request gitlab-org/gitlab-ce!27265
| * | | | | | Markdown doc refactor - squashedMarcel Amirault2019-06-276-675/+866
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change emoji to Gitlab rendering and fix typo Use built in renderer for math Touchups to GFM Doc and bring in suggestions from MR 22122 Fix link Add epics to align docs Add epic badge Fix dashes making accidental headers, and move wikis down, add emoji note Add section explaining GitLab markdown extensions Update to incorporate recent changes Add links rendering, fix issue rendering as color chip Add links rendering, fix issue rendering as color chip Update links to GitLab rendered version of markdown doc Separate GFM extensions, reorder list, other tweaks Update code blocks and highlighting Trying to fix improper markdown rendering Fix rendering broken by triple backticks and add emoji note testing triple tildes instead of quad backticks testing rending after mermaid Various fixes to improve markdown rendering Update markdown doc after review Fix markdown doc after review, part two fix typo in markdown doc
* | | | | | Merge branch 'sh-update-mermaid' into 'master'Fatih Acet2019-06-274-13/+126
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Mermaid to 8.1.0 Closes #60869 See merge request gitlab-org/gitlab-ce!30036
| * | | | | | Update Mermaid to 8.1.0Stan Hu2019-06-254-13/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes dotted lines not rendering when the htmlLabels setting is false (https://github.com/knsv/mermaid/pull/828). Full list of changes: https://github.com/knsv/mermaid/releases Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60869
* | | | | | | Merge branch 'dz-remove-deprecated-user-routes' into 'master'Mike Greiling2019-06-279-45/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated user routes See merge request gitlab-org/gitlab-ce!30044
| * | | | | | | Remove deprecated /u/:username routesdz-remove-deprecated-user-routesDmitriy Zaporozhets2019-06-269-45/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also release `u` from TOP_LEVEL_ROUTES Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'docs/sidekiq-cluster' into 'master'Evan Read2019-06-261-68/+131
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the Sidekiq cluster docs See merge request gitlab-org/gitlab-ce!28831
| * | | | | | | | Clean up the Sidekiq cluster docsdocs/sidekiq-clusterAchilleas Pipinellis2019-06-191-68/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More importantly: - Move the command line tips under a troubleshooting section - Add new section: "Ignore all GitHub import queues" - Add list of existing Sidekiq queues
* | | | | | | | | Merge branch 'rj-fix-spec' into 'master'29756-meta-prioritize-ie11-edge-testing-same-as-regular-browser-testing-for-features-and-bug-fixes-that-we-shipThong Kuah2019-06-261-9/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative position to order issues See merge request gitlab-org/gitlab-ce!30095
| * | | | | | | | | Properly check that issue list has persistedStan Hu2019-06-261-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A valid user needs to be signed in, and we need to reload the page to verify that the issue list was saved on the backend.
| * | | | | | | | | Use relative position to order issuesrj-fix-specRajat Jain2019-06-261-13/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch '63247-add-conf-toast-and-link' into 'master'Mike Greiling2019-06-2611-51/+147
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Including a link to the posted comment for visual review app review feature" Closes #63247 See merge request gitlab-org/gitlab-ce!29719
| * | | | | | | | | | Basic note appearsSarah Groff Hennigh-Palermo2019-06-2611-51/+147
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens in multiple files
* | | | | | | | | | Merge branch 'i18n-access_tokens-of-user-profile' into 'master'Fatih Acet2019-06-266-43/+145
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings of access tokens page in user profile See merge request gitlab-org/gitlab-ce!28635
| * | | | | | | | | | Externalize strings of access tokens page in user profileantony liu2019-06-266-43/+145
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '59974-multidash' into 'master'Fatih Acet2019-06-2610-15/+160
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load dashboards from project's git repository Closes #59974 See merge request gitlab-org/gitlab-ce!29348
| * | | | | | | | | | Add feature flag and dashboard endpointSimon Knox2019-06-2610-15/+160
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* | | | | | | | | | Merge branch '62765-add-jquery-to-jest-setup' into 'master'Mike Greiling2019-06-261-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add jQuery in jest test_setup See merge request gitlab-org/gitlab-ce!30100
| * | | | | | | | | | Add jQuery to jest test_setupPaul Slaughter2019-06-261-0/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-2620-194/+64
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Sentry settings from application settings See merge request gitlab-org/gitlab-ce!28447
| * | | | | | | | | | refactor(db): remove Sentry from application settings, disable_ddl_transactionRoger Meier2019-06-251-0/+2
| | | | | | | | | | |
| * | | | | | | | | | refactor(db): remove Sentry from application settingsRoger Meier2019-06-252-5/+1
| | | | | | | | | | |