summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-201-1/+1
|\ | | | | | | | | Refactor code that creates and destroys project/group members See merge request !10735
| * Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-171-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'uassign_on_member_removing' into 'master' Sean McGivern2017-04-201-8/+5
|\ \ | | | | | | | | | | | | | | | | | | Unassign all Issues and Merge Requests when member leaves a team Closes #30768 and #24117 See merge request !10755
| * | Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removingValery Sizov2017-04-201-3/+3
| | |
| * | Remove assigned_(issues|merge_requests) methods from the issuableValery Sizov2017-04-181-5/+2
| |/
* | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-191-0/+2
|\ \ | | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509
| * | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-181-0/+2
| | |
* | | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-192-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display issuable state only in notes and issuable description Closes #30964 See merge request !10789
| * | | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-192-2/+2
| | | | | | | | | | | | | | | | Closes #30964
* | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-191-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481
| * | | | Fix method visibilitySean McGivern2017-04-141-2/+0
| | | | |
| * | | | Remove unused user activities codeSean McGivern2017-04-141-4/+0
| | | | |
| * | | | Port 'Add user activities API' to CESean McGivern2017-04-141-3/+1
| | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
| * | | | Remove user activities table and use redis instead of PG for recording ↵James Lopez2017-04-142-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activities Refactored specs and added a post deployment migration to remove the activity users table.
| * | | | Add user activity service and spec. Also added relevant - NOT offline - ↵James Lopez2017-04-142-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration It uses a user activity table instead of a column in users. Tested with mySQL and postgreSQL
| * | | | Port 'Add EE usage ping' to CESean McGivern2017-04-141-1/+2
| | |_|/ | |/| | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/557
* | | | Fix active user countJames Lopez2017-04-191-1/+1
| |/ / |/| |
* | | disables test settings on chat notification services when repository is empty31009-disable-test-settings-on-services-when-repository-is-emptyTiago Botelho2017-04-181-1/+1
| | |
* | | Use DeleteUserWorker for removing users via spam logssh-use-delete-worker-spam-logsStan Hu2017-04-171-2/+2
| | | | | | | | | | | | | | | Before deleting a user via a SpamLog would just call `user.destroy`, which may omit other things that need to be cleaned up.
* | | Merge branch 'fix-follow-with-multiple-paths' into 'master' Douwe Maan2017-04-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix following with multiple paths Closes gitlab-ee#2175 See merge request !10737
| * | | Fix following with multiple pathsfix-follow-with-multiple-pathsSean McGivern2017-04-171-1/+1
| |/ / | | | | | | | | | | | | `git log --follow` is only supported for a single path. CE doesn't currently pass multiple paths, but EE does.
* | | Merge branch 'dz-remove-repo-version' into 'master' Douwe Maan2017-04-171-7/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove `Repository#version` method and tests Closes #24251 See merge request !10734
| * | | Removes `Repository#version` method and testsdz-remove-repo-versionDmitriy Zaporozhets2017-04-171-7/+1
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Hard delete users' associated records deleted from AbuseReportssh-add-option-to-hard-deleteStan Hu2017-04-161-1/+1
|/ / | | | | | | | | | | In the case of spammers, we really want a hard delete to avoid retaining spam. Closes #31021
* | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-131-1/+2
| |
* | Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constantRobert Speicher2017-04-121-2/+2
| |
* | Merge branch 'fix_spaces_in_label_title' into 'master' Sean McGivern2017-04-121-0/+6
|\ \ | |/ |/| | | | | Remove heading and trailing spaces from label's color and title See merge request !10603
| * Remove heading and trailing spaces from label's color and titleblackst0ne2017-04-121-0/+6
| |
* | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-122-15/+16
|\ \ | | | | | | | | | | | | Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298
| * | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-112-15/+16
| |/
* | Merge branch '30457-expire-note-destroy' into 'master'Sean McGivern2017-04-121-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix issue's note cache expiration after delete Closes #30457 See merge request !10461
| * | Fix issue's note cache expiration after deletemhasbini2017-04-111-0/+1
| |/
* | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-1110-21/+57
|\ \ | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| * | Statisfy Robertcop and Seancopdm-outdated-diff-linkDouwe Maan2017-04-111-9/+3
| | |
| * | Add specsDouwe Maan2017-04-101-0/+12
| | |
| * | Some code tweaksDouwe Maan2017-04-083-8/+12
| | |
| * | Fix find_by_diff_refsDouwe Maan2017-04-081-1/+1
| | |
| * | Fix specs and make tweaksDouwe Maan2017-04-082-2/+5
| | |
| * | Cache MR diffs by diff refsDouwe Maan2017-04-081-1/+5
| | |
| * | Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-088-13/+32
| | |
* | | Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-nameDouwe Maan2017-04-113-7/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unused scopes See merge request !10609
| * | | Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-103-6/+0
| | | |
| * | | Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-101-1/+0
| | |/ | |/|
* | | Merge branch 'zj-fk-ci-triggers' into 'master' Yorick Peterse2017-04-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Add foreign key on trigger requests See merge request !10537
| * | | Add foreign key on trigger requestszj-fk-ci-triggersZ.J. van de Weg2017-04-111-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | I started out as I missed the foreign key on ci_triggers and projects. However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388. Still I found a missing foreign key, between the trigger requests and triggers. This commit adds it, and removes the depend: :destroy on the Rails model Ci::Triggers
* | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-111-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | | Add method that returns a registry repository locationGrzegorz Bizon2017-04-101-0/+4
| | |/ | |/|
* | | Merge branch 'fix_cache_expiration_in_repository' into 'master' Robert Speicher2017-04-101-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix redundant cache expiration in Repository Closes #30146 See merge request !10575
| * | | Fix redundant cache expiration in Repositoryblackst0ne2017-04-101-2/+0
| |/ /
* | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-101-5/+25
| |/ |/|