summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Create shared gl-modal-vuex component and moduleee1979-gl-modal-vuexPaul Slaughter2019-01-039-0/+353
| | | | | | | **Why?** It is significantly easier to manage the visibility of the modal in Vuex. The module contains the state and mutations to manage this. The component wraps GlModal and syncs the visibility with the module.
* Merge branch 'gt-update-inlcude-parameter-description' into 'master'Evan Read2019-01-041-3/+3
|\ | | | | | | | | Update `include` parameter usage description See merge request gitlab-org/gitlab-ce!24118
| * Update `include` parameter usage description [ci skip]George Tsiolis2019-01-031-3/+3
| |
* | Merge branch 'sh-fix-clone-url-for-https' into 'master'Douglas Barbosa Alexandre2019-01-043-2/+46
|\ \ | | | | | | | | | | | | | | | | | | Fix clone URL not showing if protocol is HTTPS Closes #55896 See merge request gitlab-org/gitlab-ce!24131
| * | Fix clone URL not showing if protocol is HTTPSsh-fix-clone-url-for-httpsStan Hu2019-01-033-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | GitLab 11.6.2 fixed the case for HTTP. However, HTTPS still did not work because the protocol returned to `http_enabled?` was the actual protocol in use (e.g. `https` instead of `http`). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55896
* | | Merge branch '27861-add-markdown-editing-buttons-to-the-file-editor' into ↵Fatih Acet2019-01-0312-213/+421
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Add markdown editing buttons to the file editor" Closes #27861 See merge request gitlab-org/gitlab-ce!23480
| * | | Add markdown buttons to file editor27861-add-markdown-editing-buttons-to-the-file-editorSam Bigelow2019-01-0212-213/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we have markdown files in many places (e.g. comments, new issues, etc.). This Merge Request detects if the file being edited is a markdown file and adds markdown buttons and their functionality to the single file editor (Not the web IDE)
* | | | Merge branch 'knative-prometheus' into 'master'Kamil Trzciński2019-01-038-3/+154
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add Knative metrics to Prometheus See merge request gitlab-org/gitlab-ce!23972
| * | | Add Knative metrics to PrometheusChris Baumbauer2019-01-038-3/+154
|/ / /
* | | Merge branch 'tz-user-popover-follow-up' into 'master'Clement Ho2019-01-035-16/+24
|\ \ \ | | | | | | | | | | | | | | | | Added Comment to user avatar Image, Changed Fixtures to created ones, added shadow color See merge request gitlab-org/gitlab-ce!23768
| * | | Comment user avatar Image, Changed Fixtures, added new shadow colortz-user-popover-follow-upTim Zallmann2018-12-125-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to reorder css variables Neede to reorder vars again Added Changelog
* | | | Merge branch '54386-integrate-mobile-css-framework-into-specific-frameworks' ↵Annabel Dunstone Gray2019-01-0314-98/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Integrate mobile CSS framework into specific frameworks Closes #54386 See merge request gitlab-org/gitlab-ce!23301
| * | | | Remove framework/mobile.scssTakuya Noguchi2018-12-123-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Move .container .title CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Move .container .content CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Integrate .nav-links li a CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .nav-links li a CSS for mobileTakuya Noguchi2018-12-121-10/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Replace .check-all-holder with display propertiesTakuya Noguchi2018-12-122-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .dash-projects-filters CSS for mobileTakuya Noguchi2018-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .issues-details-filters:not(.filtered-search-block) CSS for mobileTakuya Noguchi2018-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Replace .rss-btn with display propertiesTakuya Noguchi2018-12-125-8/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .project-home-links CSS for mobileTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .project-home-panel CSS for mobileTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .git-clone-holder CSS for mobileTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove non-effective .project-repo-buttons CSSTakuya Noguchi2018-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Replace .group-buttons with display propertiesTakuya Noguchi2018-12-122-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Replace .activity-filter-block with display propertiesTakuya Noguchi2018-12-122-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .projects-search-formTakuya Noguchi2018-12-121-6/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Replace aside:not(.right-sidebar) with display propertiesTakuya Noguchi2018-12-122-7/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .note-created-agoTakuya Noguchi2018-12-121-6/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .new-issue-linkTakuya Noguchi2018-12-122-3/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Move .referenced-usersTakuya Noguchi2018-12-122-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Remove .milestone-filterTakuya Noguchi2018-12-121-6/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch 'fix-popover-header-size' into 'master'Annabel Dunstone Gray2019-01-031-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force popover-header to size 14px instead of rems Closes gitlab-ee#8941 See merge request gitlab-org/gitlab-ce!24065
| * | | | | Force popover-header to size 14px instead of remsClement Ho2019-01-031-1/+2
|/ / / / /
* | | | | Merge branch 'ce-1979-fe-settings-empty' into 'master'Kushal Pandya2019-01-033-24/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Port of "(Part 1) FE multiple approval rules settings - empty state" See merge request gitlab-org/gitlab-ce!24087
| * | | | | Update callout component to receive slotce-1979-fe-settings-emptyPaul Slaughter2019-01-022-24/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** - This is needed to add buttons to the callout
| * | | | | Add gl-spinner animation classPaul Slaughter2019-01-021-0/+22
| | | | | |
* | | | | | Merge branch 'add-link-rel-me' into 'master'Clement Ho2019-01-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rel=me to user's website link See merge request gitlab-org/gitlab-ce!24089
| * | | | | | Add rel=me to user's website linkWiktor Kwapisiewicz2019-01-031-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rel=me links allow cross-linking of user's identities. This behavior is used by software to determine if user controls profiles on two different sites. For example Mastodon uses it to display verified badge on links. Both Twitter and GitHub automatically add rel=me to links added to users' profiles. See: https://www.zylstra.org/blog/2018/10/mastodon-rel-me/ See: http://microformats.org/wiki/rel-me
* | | | | | Merge branch 'sh-drop-webhooks-project-export' into 'master'50521-block-emojis-and-symbol-characters-from-user-s-full-namesDouwe Maan2019-01-033-7/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop Webhooks from project import/export config Closes #53513 See merge request gitlab-org/gitlab-ce!24121
| * | | | | | Drop Webhooks from project import/export configStan Hu2019-01-033-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Webhook URLs were recently encrypted in the database via https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21645, and as a result they are no longer exported. When an exported project with Webhooks is imported, the project import service will fail with `URI::InvalidURIError: bad URI(is not URI?)` due to a blank URL. We avoid this by disabling the export/import of Webhooks in the first place. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53513
* | | | | | | Merge branch '55883-modal-header-titles-have-an-unnecessary-top-margin' into ↵Clement Ho2019-01-033-5/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove unnecessary top margin in modal header titles Closes #55883 See merge request gitlab-org/gitlab-ce!24108
| * | | | | | | Remove top margin in modal header titles55883-modal-header-titles-have-an-unnecessary-top-marginLukas Eipert2019-01-033-5/+19
| | | | | | | |
* | | | | | | | Merge branch 'qa-issues-collapsible-comments' into 'master'Sanad Liaquat2019-01-037-28/+99
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapsible Comments Test for Issues Closes #52617 See merge request gitlab-org/gitlab-ce!22985
| * | | | | | | | Collapsible Comments Test for IssuesRamya Authappan2019-01-037-28/+99
|/ / / / / / / /
* | | | | | | | Merge branch 'deprecated-positional-spec-arguments' into 'master'Lin Jen-Shin2019-01-035-9/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix deprecation: Using positional arguments in integration tests See merge request gitlab-org/gitlab-ce!24110
| * | | | | | | Fix deprecation: Using positional arguments in integration testsJasper Maes2019-01-025-9/+14
| |/ / / / / /
* | | | | | | Merge branch '54844-report-syntax-dep-scan-ado' into 'master'Kamil Trzciński2019-01-033-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use reports syntax for Dependency scanning job Closes #54844 See merge request gitlab-org/gitlab-ce!24081
| * | | | | | | Use reports syntax for Dependency scanning jobTetiana Chupryna2019-01-033-1/+10
|/ / / / / / /
View Lorry Controller Status