summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Fix project feature being deleted when updating project with invalid visibili...Felipe Artur2017-09-122-2/+4
* Merge branch 'import-sources-fix' into 'master'Rémy Coutable2017-09-111-1/+1
|\
| * Read import sources from setting at first initializationVisay Keo2017-09-091-1/+1
* | Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-113-14/+45
|\ \
| * | Rework how recent push events are retrieveduser-recent-pushYorick Peterse2017-09-083-14/+45
* | | Merge branch 'feature/gpg-verification-status-remove-ignore-rule' into 'master'Douwe Maan2017-09-111-3/+0
|\ \ \ | |_|/ |/| |
| * | Revert "make valid_signature an ignored column"Alexis Reigel2017-09-051-3/+0
* | | Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-081-1/+0
* | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-071-7/+6
| |/ |/|
* | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan2017-09-071-0/+14
|\ \
| * | Refactor based on code reviewMichael Kozono2017-09-061-2/+2
| * | Enable share_with_group_lock on subgroupMichael Kozono2017-09-061-0/+14
* | | Merge branch '37158-autodevops-banner' into 'master'Kamil Trzciński2017-09-071-0/+4
|\ \ \
| * \ \ Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-bannerKamil Trzcinski2017-09-078-169/+56
| |\ \ \
| * | | | Add has_auto_devops_implicitly_disabledKamil Trzcinski2017-09-071-0/+4
* | | | | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-074-5/+76
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-078-169/+56
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-069-5/+103
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add tests to cover all introduced changesKamil Trzcinski2017-09-062-2/+2
| * | | | Implement `Project#has_ci?`Kamil Trzcinski2017-09-061-0/+4
| * | | | Improve config source handling codeKamil Trzcinski2017-09-064-16/+24
| * | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0617-143/+195
| |\ \ \ \
| * | | | | Use hook for setting Pipeline config_sourceZeger-Jan van de Weg2017-09-063-14/+26
| * | | | | Incorporate another round of feedbackZeger-Jan van de Weg2017-09-063-4/+4
| * | | | | Fix boolean logic with nil valueZeger-Jan van de Weg2017-09-041-1/+1
| * | | | | Incorporate reviewZeger-Jan van de Weg2017-09-043-11/+25
| * | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0413-18/+137
| |\ \ \ \ \
| * | | | | | Fix testsZeger-Jan van de Weg2017-09-041-1/+5
| * | | | | | Add config_source to ci_pipelinesZeger-Jan van de Weg2017-08-311-4/+13
| * | | | | | 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-313-6/+25
* | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-073-9/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-073-9/+7
* | | | | | | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-071-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Restore some changes from !9199Rubén Dávila2017-09-061-0/+1
* | | | | | | | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-073-162/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-063-162/+22
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-074-7/+33
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix failing specee_issue_928_backportFelipe Artur2017-09-061-1/+1
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-0637-174/+395
| |\ \ \ \ \ \ \
| * | | | | | | | Small fixesFelipe Artur2017-08-311-0/+8
| * | | | | | | | Continue BE backportFelipe Artur2017-08-311-0/+1
| * | | | | | | | Group boards CE backportFelipe Artur2017-08-284-7/+24
* | | | | | | | | Merge branch 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-prot...Kamil Trzciński2017-09-062-2/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Remove only validationfix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protectedShinya Maeda2017-09-072-2/+0
| * | | | | | | | Revert set_protectedShinya Maeda2017-09-072-10/+2
| * | | | | | | | Fix /models/ci/pipeline.rbShinya Maeda2017-09-061-1/+1
| * | | | | | | | Use before_save :set_protectedShinya Maeda2017-09-062-2/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-061-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-061-0/+9
| | |_|_|_|_|/ / | |/| | | | | |