summaryrefslogtreecommitdiff
path: root/app/models/project.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-10-031-2/+18
|\
| * Doesn't check if path exists on disk when renaming a hashed projectDouglas Barbosa Alexandre2017-10-021-2/+18
* | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-031-0/+28
|\ \ | |/ |/|
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-021-1/+1
| |\
| * | [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? methodValery Sizov2017-09-291-1/+1
| * | [Port semi-linear history from EE] Move migration to CE and `merge_method` me...Valery Sizov2017-09-291-1/+13
| * | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-281-2/+39
| |\ \
| * | | Add spec for FfMergeServiceValery Sizov2017-09-191-1/+0
| * | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+17
* | | | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-021-2/+4
| |_|/ |/| |
* | | Create repositories via GitalyJacob Vosmaer2017-09-291-1/+1
| |/ |/|
* | Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-pathGabriel Mazetto2017-09-281-2/+39
|/
* Merge branch 'zj-update-project-settings' into 'master'Grzegorz Bizon2017-09-191-1/+1
|\
| * Allow updating of project auto devops settingsZeger-Jan van de Weg2017-09-151-1/+1
* | Merge branch 'master' into 'issue_37640'issue_37640Felipe Artur2017-09-151-0/+17
|\ \
| * | Memoize pipelines for project download buttonsYorick Peterse2017-09-141-0/+17
| |/
* | Fix project feature being deleted when updating project with invalid visibili...Felipe Artur2017-09-121-2/+2
|/
* Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-bannerKamil Trzcinski2017-09-071-0/+8
|\
| * Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-071-0/+8
| |\
| | * Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-071-0/+8
| | |\
| | | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-061-8/+27
| | | |\
| | | * | Group boards CE backportFelipe Artur2017-08-281-0/+8
* | | | | Add has_auto_devops_implicitly_disabledKamil Trzcinski2017-09-071-0/+4
|/ / / /
* | | | Add tests to cover all introduced changesKamil Trzcinski2017-09-061-1/+1
* | | | Implement `Project#has_ci?`Kamil Trzcinski2017-09-061-0/+4
* | | | Improve config source handling codeKamil Trzcinski2017-09-061-7/+7
* | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-061-1/+2
|\ \ \ \ | |/ / /
| * | | change collapse to resolve and comments to discussionsAshley Dumaine2017-09-061-1/+1
| * | | Add functionality to collapse outdated diff comments regardless of discussion...Ashley Dumaine2017-09-061-0/+1
| * | | Optimize SQL queries used in Groups::GroupMembersController#create27374-groups-groupmemberscontroller-create-is-slow-due-to-sqlRubén Dávila2017-09-051-0/+1
| | |/ | |/|
| * | Merge branch 'remove-unused-code' into 'master'Rémy Coutable2017-09-041-1/+0
| |\ \
| | * | Remove unused `Project#new_default_branch` attr_accessorMehdi Lahmam2017-08-201-1/+0
* | | | Use hook for setting Pipeline config_sourceZeger-Jan van de Weg2017-09-061-6/+11
* | | | Incorporate another round of feedbackZeger-Jan van de Weg2017-09-061-1/+1
* | | | Fix boolean logic with nil valueZeger-Jan van de Weg2017-09-041-1/+1
* | | | Incorporate reviewZeger-Jan van de Weg2017-09-041-1/+2
* | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-041-2/+21
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-09-011-0/+5
| |\ \ \
| * \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2017-08-311-2/+21
| |\ \ \ \
| | * \ \ \ Merge branch '36743-existing-repo-master' into 'master'Douwe Maan2017-08-311-2/+21
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Prevent new / renamed project from using a repository path that already exist...Gabriel Mazetto2017-08-251-2/+21
* | | | | | Fix testsZeger-Jan van de Weg2017-09-041-1/+5
* | | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-311-0/+1
* | | | | | Implement the implied CI/CD config for AutoDevOpsZeger-Jan van de Weg2017-08-311-0/+6
| |_|_|/ / |/| | | |
* | | | | Merge branch '37266-nomethoderror-undefined-method-current_application_settin...Douwe Maan2017-08-311-0/+1
|\ \ \ \ \
| * | | | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-311-0/+1
| |/ / / /
* | | | | Merge branch 'zj-disable-pages-in-subgroups' into 'master'Grzegorz Bizon2017-08-311-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't show references to Pages when not availableZeger-Jan van de Weg2017-08-311-0/+4
| |/ / /
* | | | Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-af...Lin Jen-Shin2017-08-301-2/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'archived-projects-only' into 'master'Douwe Maan2017-08-241-0/+1
| |\ \ \
View Lorry Controller Status