diff options
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/api.js | 16 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 5 |
3 files changed, 21 insertions, 1 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 7cebb88f3a4..4f66a5d080c 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -12,6 +12,7 @@ const Api = { groupProjectsPath: '/api/:version/groups/:id/projects.json', projectsPath: '/api/:version/projects.json', projectPath: '/api/:version/projects/:id', + forkedProjectsPath: '/api/:version/projects/:id/forks', projectLabelsPath: '/:namespace_path/:project_path/-/labels', projectMergeRequestsPath: '/api/:version/projects/:id/merge_requests', projectMergeRequestPath: '/api/:version/projects/:id/merge_requests/:mrid', @@ -114,6 +115,21 @@ const Api = { }, /** + * Get all projects for a forked relationship to a specified project + * @param {string} projectPath - Path or ID of a project + * @param {Object} params - Get request parameters + * @returns {Promise} - Request promise + */ + projectForks(projectPath, params) { + const url = Api.buildUrl(Api.forkedProjectsPath).replace( + ':id', + encodeURIComponent(projectPath), + ); + + return axios.get(url, { params }); + }, + + /** * Get all Merge Requests for a project, eventually filtering based on * supplied parameters * @param projectPath diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 65c0ee74c60..53a8f7c483a 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -199,7 +199,6 @@ &.user-cover-block { padding: 24px 0 0; - border-bottom: 1px solid $border-color; .nav-links { width: 100%; diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 9e1431963d9..7baab478034 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -221,6 +221,11 @@ ol { padding: 0; margin: 0 0 16px; + + ul, + ol { + margin-bottom: 0; + } } ul:dir(rtl), |