summaryrefslogtreecommitdiff
path: root/app/models/project.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/project-import_url' into 'master' Robert Speicher2016-04-151-0/+29
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-141-2/+9
| |\
| * | fix create_or_update_import_dataJames Lopez2016-04-071-1/+4
| * | refactored create_or_update_import_dataJames Lopez2016-04-071-16/+7
| * | refactored a few things based on MR feedbackJames Lopez2016-04-071-0/+13
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-041-12/+4
| |\ \
| * | | fix github import issuesJames Lopez2016-04-011-1/+1
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-281-1/+1
| |\ \ \
| * | | | first round of fixes and spec fixesJames Lopez2016-03-221-2/+3
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-221-11/+38
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-211-0/+1
| |\ \ \ \ \
| * | | | | | fix import data creationJames Lopez2016-03-211-2/+1
| * | | | | | refactored code based on feedbackJames Lopez2016-03-211-2/+8
| * | | | | | fixed few issues with the migrationJames Lopez2016-03-211-1/+2
| * | | | | | more refactoringJames Lopez2016-03-211-4/+8
| * | | | | | some refactoring based on feedbackJames Lopez2016-03-211-0/+12
* | | | | | | Use rugged to change HEADP.S.V.R2016-04-131-1/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'check-import-job-status' into 'master' Robert Speicher2016-04-121-2/+8
|\ \ \ \ \ \
| * | | | | | Check and report import job status to help diagnose issues with forkingStan Hu2016-04-111-2/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-081-12/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-041-10/+0
| |\ \ \ \ \
| | * | | | | Move unlink fork logic to a serviceBaldinof2016-03-221-20/+0
| | * | | | | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-141-9/+36
| | |\ \ \ \ \
| | * | | | | | Close merge requests when removing fork relationBaldinof2016-03-111-1/+11
| * | | | | | | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-011-2/+2
| * | | | | | | Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-311-0/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-301-0/+1
|/ / / / / /
* | | | | | Make sure we get only two returnsLin Jen-Shin2016-03-231-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-211-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/safe-import...James Lopez2016-03-211-21/+50
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Cache output of Repository#exists?Yorick Peterse2016-03-191-0/+1
| | | |_|/ | | |/| |
| * | | | update safe_import_url to prevent tokens to be showed by the UIJames Lopez2016-03-211-0/+1
* | | | | Fix specDouwe Maan2016-03-211-2/+7
* | | | | Fix specsDouwe Maan2016-03-201-2/+2
* | | | | Fix some specsDouwe Maan2016-03-201-8/+2
* | | | | Tweaks, refactoring, and specsDouwe Maan2016-03-201-19/+29
* | | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-201-4/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Cache project avatars stored in GitYorick Peterse2016-03-171-4/+1
* | | | | Fix specsFelipe Artur2016-03-181-2/+8
* | | | | Improve group visibility level featureZeger-Jan van de Weg2016-03-181-4/+16
* | | | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-17/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-151-0/+8
| |\ \ \ \
| | * \ \ \ 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
| | | | |_|/ | | | |/| |
| | * | | | Return the external issue tracker even if it's nullexternal-issue-trackerKamil Trzcinski2016-03-151-0/+1
| | |/ / /
| * | | | Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-141-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-141-0/+6
| | |\ \ \
| | | * | | Add share project from group lockDmitriy Zaporozhets2016-03-111-2/+1
| | | * | | 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-111-0/+2
| | | | |/ | | | |/|