diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:02:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:02:45 +0300 |
commit | 80f61b4035607d7cd87de993b8f5e996bde3481f (patch) | |
tree | 06b12f51e97d87192e3dd0e05edf55143645b894 /app/serializers | |
parent | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/README.md | 8 | ||||
-rw-r--r-- | app/serializers/entity_date_helper.rb | 2 | ||||
-rw-r--r-- | app/serializers/merge_request_poll_cached_widget_entity.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/serializers/README.md b/app/serializers/README.md index bb94745b0b5..93b21786015 100644 --- a/app/serializers/README.md +++ b/app/serializers/README.md @@ -317,9 +317,9 @@ MyObjectSerializer.new.represent(object.present) [grape-entity-readme]: https://github.com/ruby-grape/grape-entity/blob/master/README.md [grape-entity-class]: https://github.com/ruby-grape/grape-entity/blob/master/lib/grape_entity/entity.rb [grape-entity-only]: https://github.com/ruby-grape/grape-entity/blob/master/README.md#returning-only-the-fields-you-want -[presenters-readme]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/presenters/README.md +[presenters-readme]: https://gitlab.com/gitlab-org/gitlab-foss/blob/master/app/presenters/README.md [fluent-interface]: https://en.wikipedia.org/wiki/Fluent_interface [json-schema-gem]: https://github.com/ruby-json-schema/json-schema -[issue-20045]: https://gitlab.com/gitlab-org/gitlab-ce/issues/20045 -[issue-30898]: https://gitlab.com/gitlab-org/gitlab-ce/issues/30898 -[issue-27569]: https://gitlab.com/gitlab-org/gitlab-ce/issues/27569 +[issue-20045]: https://gitlab.com/gitlab-org/gitlab-foss/issues/20045 +[issue-30898]: https://gitlab.com/gitlab-org/gitlab-foss/issues/30898 +[issue-27569]: https://gitlab.com/gitlab-org/gitlab-foss/issues/27569 diff --git a/app/serializers/entity_date_helper.rb b/app/serializers/entity_date_helper.rb index d8f267d7183..7dadf0eb016 100644 --- a/app/serializers/entity_date_helper.rb +++ b/app/serializers/entity_date_helper.rb @@ -55,7 +55,7 @@ module EntityDateHelper is_upcoming = (due_date - Date.today).to_i > 0 time_ago = distance_of_time_in_words(due_date, Date.today) - # https://gitlab.com/gitlab-org/gitlab-ce/issues/49440 + # https://gitlab.com/gitlab-org/gitlab-foss/issues/49440 # # Need to improve the i18n here and do a full translation # of the string instead of piecewise translations. diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb index 005a3e47bbb..a3186ecbcdf 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -80,7 +80,7 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity # Once SchedulePopulateMergeRequestMetricsWithEventsData fully runs, # we can remove this method and just serialize MergeRequest#metrics - # instead. See https://gitlab.com/gitlab-org/gitlab-ce/issues/41587 + # instead. See https://gitlab.com/gitlab-org/gitlab-foss/issues/41587 def build_metrics(merge_request) # There's no need to query and serialize metrics data for merge requests that are not # merged or closed. |