Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

c80c204b

Commit c80c204b authored 7 years ago by Oswaldo Ferreir

Downloads
- Patches
- Plain Diff

Revert "Merge branch 'zj-memoization-mr-commits' into 'master'"

This reverts commit 54f00812.

parent f48e815c

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/models/merge_request.rb 4 additions, 17 deletions

app/models/merge_request.rb
app/models/merge_request_diff.rb 3 additions, 3 deletions

app/models/merge_request_diff.rb
changelogs/unreleased/zj-memoization-mr-commits.yml 0 additions, 5 deletions

changelogs/unreleased/zj-memoization-mr-commits.yml
lib/gitlab/conflict/file_collection.rb 0 additions, 2 deletions

lib/gitlab/conflict/file_collection.rb
lib/gitlab/utils/strong_memoize.rb 5 additions, 15 deletions

lib/gitlab/utils/strong_memoize.rb
spec/lib/gitlab/utils/strong_memoize_spec.rb 0 additions, 12 deletions

spec/lib/gitlab/utils/strong_memoize_spec.rb
spec/models/merge_request_spec.rb 1 addition, 3 deletions

spec/models/merge_request_spec.rb

with 13 additions and 57 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment