summaryrefslogtreecommitdiff
path: root/app/models/project.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prefer-ref' into 'master' Douwe Maan2016-07-071-2/+2
|\
| * Prefer ref rather than id because id is shadowing database idLin Jen-Shin2016-07-071-2/+2
* | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-13/+8
|\ \ | |/ |/|
| * Have `Project#open_branches` return branches that are matched by a wildcard p...18627-wildcard-branch-protectionTimothy Andrew2016-07-071-1/+5
| * Support wildcard matches for protected branches at the model level.Timothy Andrew2016-07-051-13/+4
* | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-061-3/+3
|\ \
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-301-3/+19
| |\ \
| * | | few changes based on feedbackJames Lopez2016-06-301-2/+2
| * | | fix merge conflictsJames Lopez2016-06-281-0/+11
| |\ \ \
| * | | | another fix and fixed specJames Lopez2016-06-221-0/+2
| * | | | Merge branches 'fix/import-url-validator' and 'master' of gitlab.com:gitlab-o...James Lopez2016-06-201-2/+50
| |\ \ \ \
| * | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-171-3/+1
* | | | | | Dumb-down avatar presence check in `avatar_url` methodsRobert Speicher2016-07-051-1/+1
| |_|_|_|/ |/| | | |
* | | | | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-011-2/+6
| |_|_|/ |/| | |
* | | | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-291-0/+1
* | | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-291-3/+17
* | | | Added Bugzilla as external issue tracker optionTim2016-06-291-0/+1
| |_|/ |/| |
* | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-271-0/+11
| |/ |/|
* | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-1/+33
|\ \
| * \ fixed merge conflicts on UI branchJames Lopez2016-06-161-18/+8
| |\ \
| | * \ fixed merge conflictsJames Lopez2016-06-161-18/+8
| | |\ \
| | | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-161-18/+8
| | | |\ \ | | | | |/
| | | * | Revert "squashed merge and fixed conflicts"James Lopez2016-06-161-8/+18
| | | * | squashed merge and fixed conflictsJames Lopez2016-06-161-18/+8
| * | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-151-2/+11
| * | | | some refactoring - renaming things, etc..James Lopez2016-06-151-3/+3
| * | | | project export archiverJames Lopez2016-06-141-0/+9
| * | | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-141-1/+1
| * | | | new export stuff and viewJames Lopez2016-06-141-10/+0
| * | | | lots of refactoring to reuse import serviceJames Lopez2016-06-141-0/+4
| |/ / /
| * | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-107/+153
| |\ \ \ | | |/ /
| | * | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-06-131-19/+80
| | |\ \
| | * \ \ merge hellJames Lopez2016-06-031-88/+73
| | |\ \ \
| | * | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-031-73/+88
| | * | | | Fix merge conflicts - squashed commitJames Lopez2016-06-031-88/+73
| * | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-091-37/+47
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-05-091-37/+47
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-041-0/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | add export worker to process project export asyncJames Lopez2016-05-041-0/+10
| * | | | | | picking stuff from ui related to importJames Lopez2016-05-031-0/+10
| |/ / / / /
* | | | | | Merge branch 'fix-project-find-with-namespace-order' into 'master' Robert Speicher2016-06-171-1/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed ordering in Project.find_with_namespacefix-project-find-with-namespace-orderYorick Peterse2016-06-161-1/+17
* | | | | | Set inverse_of for Project/Services relationYorick Peterse2016-06-151-1/+1
|/ / / / /
* | | | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-151-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-5/+0
| |\ \ \ \ \
| * | | | | | Added initial version of deploymentsKamil Trzcinski2016-06-101-0/+2
| | |_|_|_|/ | |/| | | |
* | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-141-1/+3
* | | | | | Add request access for groupsRémy Coutable2016-06-141-11/+2
| |/ / / / |/| | | |
* | | | | Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-131-5/+0
|/ / / /
* | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-11/+60
|\ \ \ \
View Lorry Controller Status