diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-25 01:36:19 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-10-24 20:36:19 +0300 |
| commit | 6eeadb2082193f8e3dc5269dfc6da2daef7eb6a1 (patch) | |
| tree | d28d3be3451194e98a5c01097347e7eebdb6393f /models/fixtures | |
| parent | 03900303a9500b33b33ff03fd6dd325147a1117e (diff) | |
| download | gitea-6eeadb2082193f8e3dc5269dfc6da2daef7eb6a1.tar.gz gitea-6eeadb2082193f8e3dc5269dfc6da2daef7eb6a1.zip | |
Hide unactive on explore users and some refactors (#2741)
* hide unactive on explore users and some refactors
* fix test for removed Organizations
* fix test for removed Organizations
* fix imports
* fix logic bug
* refactor the toConds
* Rename TestOrganizations to TestSearchUsers and add tests for users
* fix other tests
* fix other tests
* fix watchers tests
* fix comments and remove unused code
Diffstat (limited to 'models/fixtures')
| -rw-r--r-- | models/fixtures/issue_watch.yml | 2 | ||||
| -rw-r--r-- | models/fixtures/user.yml | 2 | ||||
| -rw-r--r-- | models/fixtures/watch.yml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/models/fixtures/issue_watch.yml b/models/fixtures/issue_watch.yml index 596662d20c..75351eb17f 100644 --- a/models/fixtures/issue_watch.yml +++ b/models/fixtures/issue_watch.yml @@ -1,6 +1,6 @@ - id: 1 - user_id: 1 + user_id: 9 issue_id: 1 is_watching: true created_unix: 946684800 diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml index 73ec1c8593..1e06255988 100644 --- a/models/fixtures/user.yml +++ b/models/fixtures/user.yml @@ -13,6 +13,7 @@ avatar: avatar1 avatar_email: user1@example.com num_repos: 0 + is_active: true - id: 2 @@ -62,6 +63,7 @@ avatar_email: user4@example.com num_repos: 0 num_following: 1 + is_active: true - id: 5 diff --git a/models/fixtures/watch.yml b/models/fixtures/watch.yml index 2ff888b7c7..5cd3b55fc4 100644 --- a/models/fixtures/watch.yml +++ b/models/fixtures/watch.yml @@ -10,5 +10,5 @@ - id: 3 - user_id: 10 + user_id: 9 repo_id: 1 |