summaryrefslogtreecommitdiff
path: root/app/models/project.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'log-project-deletion' into 'master' Stan Hu2016-07-281-1/+4
|\
| * Add a log message when a project is scheduled for destruction for debuggingStan Hu2016-07-281-1/+4
* | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-281-1/+5
|\ \ | |/
| * Fix Project#to_param to keep invalid project suitable for use in URLsDouglas Barbosa Alexandre2016-07-271-1/+5
* | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-271-1/+3
|\ \ | |/
| * Fix a bug where forking a project from a repository storage to another would ...20302-forking-a-project-from-one-storage-to-another-failsAlejandro Rodríguez2016-07-261-1/+3
* | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-261-5/+115
|\ \ | |/
| * Improve project rename log messages for better debuggingimprove-rename-loggingStan Hu2016-07-231-1/+10
| * Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable2016-07-221-7/+7
| |\
| | * Since it's too hard to use JOIN with Rails... feedback:Lin Jen-Shin2016-07-211-7/+7
| * | Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable2016-07-211-0/+11
| |\ \ | | |/
| | * Merge branch 'master' into artifacts-from-ref-and-build-name-apiLin Jen-Shin2016-07-211-0/+46
| | |\
| | * | Workaround MySQL with INNER JOIN:Lin Jen-Shin2016-07-211-2/+7
| | * | Use one query. Feedback:Lin Jen-Shin2016-07-201-7/+2
| | * | Avoid mixing builds from different pipelines:Lin Jen-Shin2016-07-201-2/+7
| | * | Join on associationLin Jen-Shin2016-07-201-1/+1
| | * | We need INNER JOIN to get the right pipeline,Lin Jen-Shin2016-07-201-1/+1
| | * | Now we could use normal relation, feedback:Lin Jen-Shin2016-07-201-2/+1
| | * | Use default_branch rather than master, feedback:Lin Jen-Shin2016-07-201-1/+1
| | * | API for downloading latest successful build:Lin Jen-Shin2016-07-191-0/+7
| * | | Refactor user authorization check for a single project to avoid querying all ...Alejandro Rodríguez2016-07-201-0/+40
| | |/ | |/|
| * | Merge branch 'ci-predefined-variables' into 'master' Rémy Coutable2016-07-201-0/+30
| |\ \
| | * | Fix review commentsci-predefined-variablesKamil Trzcinski2016-07-201-1/+4
| | * | Improve implementation of variablesKamil Trzcinski2016-07-201-0/+27
| | |/
| * | speed up ExternalWikiService#get_project_wiki_pathEugene Howe2016-07-191-0/+16
| |/
| * Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-181-0/+4
| |\
| | * Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-0/+4
| * | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-181-2/+2
| |\ \ | | |/ | |/|
| | * Track a user who created a pipelineKamil Trzcinski2016-07-151-2/+2
| * | use method in validates statementJames Lopez2016-07-181-1/+1
| * | Allow a project import URL to be blank to prevent false positivesStan Hu2016-07-171-2/+2
| |/
* | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-151-28/+110
|\ \ | |/
| * Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-141-2/+8
| |\
| | * updated create_or_update_import_data to use guard clauseJames Lopez2016-07-131-1/+3
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-...James Lopez2016-07-131-0/+4
| | |\
| | * | fix more specsJames Lopez2016-07-131-1/+5
| | * | fix specsJames Lopez2016-07-131-1/+1
| | * | fixes a few issues to do with import_url not being saved correctly for import...James Lopez2016-07-121-2/+2
| * | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-4/+0
| | |/ | |/|
| * | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-0/+4
| |/
| * 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