summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-1510-105/+70
|\
| * Improving the original label-subscribing implementationRémy Coutable2016-03-153-19/+18
| * Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-153-23/+52
| * Merge branch 'fix-activerecord-join-stupidity' into 'master' Robert Speicher2016-03-151-0/+7
| |\
| | * Ignore eager loading in Project.search UNIONYorick Peterse2016-03-151-0/+7
| * | Merge branch 'external-issue-tracker' into 'master' Yorick Peterse2016-03-151-0/+1
| |\ \
| | * | Return the external issue tracker even if it's nullexternal-issue-trackerKamil Trzcinski2016-03-151-0/+1
| | |/
| * | Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable2016-03-151-8/+0
| |\ \
| | * | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-8/+0
| | |/
| * | Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobsRémy Coutable2016-03-151-1/+2
| |/
| * Merge branch 'fix-commit-status-rendering' into 'master' Robert Speicher2016-03-153-75/+11
| |\
| | * Fix review commentsfix-commit-status-renderingKamil Trzcinski2016-03-142-2/+6
| | * Cleanup CiCommit and CiBuildKamil Trzcinski2016-03-143-75/+7
* | | Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-147-14/+123
|\ \ \ | |/ /
| * | Merge branch 'rs-note-active-spec' into 'master'Robert Speicher2016-03-141-12/+21
| |\ \
| | * | Add unit specs for `Note#active?`rs-note-active-specRobert Speicher2016-03-111-12/+21
| * | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-145-2/+97
| |\ \ \ | | |_|/ | |/| |
| | * | Add share project from group lockDmitriy Zaporozhets2016-03-111-2/+1
| | * | Add finders logic and tests for shared projects featureDmitriy Zaporozhets2016-03-111-1/+2
| | * | Allow users to access project shared with their groupDmitriy Zaporozhets2016-03-111-1/+51
| | * | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-111-0/+5
| | * | Bring ProjectGroupLink model and migrations from EEDmitriy Zaporozhets2016-03-113-0/+40
| * | | fixes issuestiagonbotelho2016-03-121-3/+2
| * | | fixes issues for mr acceptancetiagonbotelho2016-03-121-1/+6
| * | | implements upcoming filter in milstonestiagonbotelho2016-03-121-0/+1
* | | | Create an external users tab on Admin user listZeger-Jan van de Weg2016-03-131-2/+3
* | | | Remove Project#publicishZeger-Jan van de Weg2016-03-131-6/+0
* | | | External UsersZeger-Jan van de Weg2016-03-132-17/+29
|/ / /
* | | Merge branch 'projects-finder-ee-compatible' into 'master' Dmitriy Zaporozhets2016-03-121-6/+3
|\ \ \
| * | | Removed User#project_relationsprojects-finder-ee-compatibleYorick Peterse2016-03-121-6/+3
* | | | Merge branch 'rs-disallow-blank-line-code' into 'master' Douwe Maan2016-03-121-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Disallow blank (non-null) values for a Note's `line_code` attributers-disallow-blank-line-codeRobert Speicher2016-03-111-1/+6
| | |/ | |/|
* | | Merge branch 'fix/token-timing-attack' into 'master' Douwe Maan2016-03-122-3/+3
|\ \ \ | |/ / |/| |
| * | add SHA256 to secure_comparefix/token-timing-attackJames Lopez2016-03-082-3/+3
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/token-timin...James Lopez2016-03-0817-208/+250
| |\ \
| * | | fix token issue - timing attackJames Lopez2016-03-022-3/+3
* | | | Use a UNION in MergeRequest.in_projectsYorick Peterse2016-03-111-1/+18
* | | | Make Namespace.search case-insensitiveYorick Peterse2016-03-111-1/+11
* | | | Removed arel_table receiver from search methodsYorick Peterse2016-03-116-6/+6
* | | | Clean up ProjectsFinder for getting user projectsYorick Peterse2016-03-111-3/+6
* | | | Use ILIKE/LIKE for searching milestonesYorick Peterse2016-03-111-2/+11
* | | | Use ILIKE/LIKE for Issuable.search and full_searchYorick Peterse2016-03-111-2/+19
* | | | Use ILIKE/LIKE for searching CI runnersYorick Peterse2016-03-111-3/+17
* | | | Use ILIKE/LIKE for searching groupsYorick Peterse2016-03-111-1/+11
* | | | Use ILIKE/LIKE for searching usersYorick Peterse2016-03-111-1/+15
* | | | Use ILIKE/LIKE for searching notesYorick Peterse2016-03-111-1/+11
* | | | Use ILIKE/LIKE for searching snippetsYorick Peterse2016-03-111-2/+22
* | | | Use ILIKE in Project.search_by_titleYorick Peterse2016-03-111-1/+4
* | | | Use ILIKE/LIKE + UNION in Project.searchYorick Peterse2016-03-111-6/+24
| |_|/ |/| |
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expirin...Jacob Vosmaer2016-03-103-3/+9
|\ \ \
View Lorry Controller Status