summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG17
-rw-r--r--app/models/repository.rb4
2 files changed, 20 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dca688f514e..6ba3bdb2012 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,22 @@
Please view this file on the master branch, on stable branches it's out of date.
+v 8.4.0 (unreleased)
+ - Add support for Google reCAPTCHA in user registration to prevent spammers (Stan Hu)
+ - Implement new UI for group page
+ - Implement search inside emoji picker
+ - Add API support for looking up a user by username (Stan Hu)
+ - Add project permissions to all project API endpoints (Stan Hu)
+ - Only allow group/project members to mention `@all`
+ - Expose Git's version in the admin area
+ - Add "Frequently used" category to emoji picker
+ - Add CAS support (tduehr)
+ - Add link to merge request on build detail page.
+ - Revert back upvote and downvote button to the issue and MR pages
+
+v 8.3.2 (unreleased)
+ - Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll (Stan Hu)
+ - Enable "Add key" button when user fills in a proper key
+
v 8.3.1
- Fix Error 500 when global milestones have slashes (Stan Hu)
- Fix Error 500 when doing a search in dashboard before visiting any project (Stan Hu)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 2c25f4ce451..1f4651f14ed 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -76,7 +76,9 @@ class Repository
path: path,
limit: limit,
offset: offset,
- follow: path.present?
+ # --follow doesn't play well with --skip. See:
+ # https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520
+ follow: false
}
commits = Gitlab::Git::Commit.where(options)