diff options
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_row_utils.js | 8 | ||||
| -rw-r--r-- | lib/api/api.rb | 2 | ||||
| -rw-r--r-- | lib/api/project_events.rb | 7 | ||||
| -rw-r--r-- | locale/gitlab.pot | 8 | ||||
| -rw-r--r-- | spec/frontend/diffs/components/diff_row_utils_spec.js | 8 |
5 files changed, 19 insertions, 14 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_row_utils.js b/app/assets/javascripts/diffs/components/diff_row_utils.js index e0749b63021..479853caae3 100644 --- a/app/assets/javascripts/diffs/components/diff_row_utils.js +++ b/app/assets/javascripts/diffs/components/diff_row_utils.js @@ -72,17 +72,17 @@ export const addCommentTooltip = (line) => { if (brokenSymlink) { if (brokenSymlink.wasSymbolic || brokenSymlink.isSymbolic) { tooltip = __( - 'Commenting on symbolic links that replace or are replaced by files is currently not supported.', + 'Commenting on symbolic links that replace or are replaced by files is not supported', ); } else if (brokenSymlink.wasReal || brokenSymlink.isReal) { tooltip = __( - 'Commenting on files that replace or are replaced by symbolic links is currently not supported.', + 'Commenting on files that replace or are replaced by symbolic links is not supported', ); } } else if (fileOnlyMoved) { - tooltip = __('Commenting on files that are only moved or renamed is currently not supported'); + tooltip = __('Commenting on files that are only moved or renamed is not supported'); } else if (brokenLineCode) { - tooltip = __('Commenting on this line is currently not supported'); + tooltip = __('Commenting on this line is not supported'); } return tooltip; diff --git a/lib/api/api.rb b/lib/api/api.rb index 41884731489..b0d76cd3eb4 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -205,6 +205,7 @@ module API mount ::API::PersonalAccessTokens::SelfInformation mount ::API::PersonalAccessTokens mount ::API::ProjectClusters + mount ::API::ProjectEvents mount ::API::ProjectExport mount ::API::ProjectHooks mount ::API::ProjectRepositoryStorageMoves @@ -300,7 +301,6 @@ module API mount ::API::PagesDomains mount ::API::ProjectContainerRepositories mount ::API::ProjectDebianDistributions - mount ::API::ProjectEvents mount ::API::ProjectImport mount ::API::ProjectMilestones mount ::API::ProjectPackages diff --git a/lib/api/project_events.rb b/lib/api/project_events.rb index 6315a6c9b1a..d90ce32c354 100644 --- a/lib/api/project_events.rb +++ b/lib/api/project_events.rb @@ -13,9 +13,14 @@ module API params do requires :id, types: [String, Integer], desc: 'The ID or URL-encoded path of the project' + optional :action, type: String, desc: 'Include only events of a particular action type' + optional :target_type, type: String, desc: 'Include only events of a particular target type' + optional :before, type: DateTime, desc: 'Include only events created before a particular date' + optional :after, type: DateTime, desc: 'Include only events created after a particular date' + optional :sort, type: String, desc: 'Sort events in asc or desc order by created_at. Default is desc' end resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do - desc "List a Project's visible events" do + desc "List a project's visible events" do success Entities::Event end params do diff --git a/locale/gitlab.pot b/locale/gitlab.pot index adc909b0ab0..2c129de87fe 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9789,16 +9789,16 @@ msgstr "" msgid "Comment/Reply (quoting selected text)" msgstr "" -msgid "Commenting on files that are only moved or renamed is currently not supported" +msgid "Commenting on files that are only moved or renamed is not supported" msgstr "" -msgid "Commenting on files that replace or are replaced by symbolic links is currently not supported." +msgid "Commenting on files that replace or are replaced by symbolic links is not supported" msgstr "" -msgid "Commenting on symbolic links that replace or are replaced by files is currently not supported." +msgid "Commenting on symbolic links that replace or are replaced by files is not supported" msgstr "" -msgid "Commenting on this line is currently not supported" +msgid "Commenting on this line is not supported" msgstr "" msgid "Comments" diff --git a/spec/frontend/diffs/components/diff_row_utils_spec.js b/spec/frontend/diffs/components/diff_row_utils_spec.js index d0437808a17..a6f508c73eb 100644 --- a/spec/frontend/diffs/components/diff_row_utils_spec.js +++ b/spec/frontend/diffs/components/diff_row_utils_spec.js @@ -149,12 +149,12 @@ describe('classNameMapCell', () => { describe('addCommentTooltip', () => { const brokenSymLinkTooltip = - 'Commenting on symbolic links that replace or are replaced by files is currently not supported.'; + 'Commenting on symbolic links that replace or are replaced by files is not supported'; const brokenRealTooltip = - 'Commenting on files that replace or are replaced by symbolic links is currently not supported.'; + 'Commenting on files that replace or are replaced by symbolic links is not supported'; const lineMovedOrRenamedFileTooltip = - 'Commenting on files that are only moved or renamed is currently not supported'; - const lineWithNoLineCodeTooltip = 'Commenting on this line is currently not supported'; + 'Commenting on files that are only moved or renamed is not supported'; + const lineWithNoLineCodeTooltip = 'Commenting on this line is not supported'; const dragTooltip = 'Add a comment to this line or drag for multiple lines'; it('should return default tooltip', () => { |