summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-127-159/+143
* Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-121-1/+1
|\
| * Use configured git rather than system gituse-configured-gitRobert Schilling2017-01-051-1/+1
* | Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-buttonSean McGivern2017-01-121-0/+6
|\ \
| * | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+6
* | | New error message recreating projects on pending deletefix/project-delete-tooltipJames Lopez2017-01-112-0/+30
|/ /
* | Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master' Sean McGivern2017-01-101-1/+1
|\ \
| * | Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analyticsToon Claes2017-01-091-1/+1
* | | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-091-2/+10
|\ \ \
| * \ \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-097-7/+55
| |\ \ \
| * \ \ \ Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-051-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-0414-35/+28
| |\ \ \ \
| * \ \ \ \ fix pipelines/index.html.haml merge conflictRegis2017-01-0211-35/+134
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-242-3/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master and fix application.rb conflictRegis2016-12-239-19/+56
| |\ \ \ \ \ \ \
| * | | | | | | | Add specs for pipeline entity and improve factoryGrzegorz Bizon2016-12-211-0/+4
| * | | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2127-126/+465
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-1624-149/+229
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve performance of Pipelines APIKamil Trzcinski2016-12-151-2/+6
* | | | | | | | | | | Merge branch 'label-length-validation' into 'master' Rémy Coutable2017-01-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | validate length of label.titleTomáš Kukrál2017-01-091-0/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'remove-project-authorizations-id-column' into 'master' Douwe Maan2017-01-092-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Remove the project_authorizations.id columnremove-project-authorizations-id-columnYorick Peterse2017-01-082-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' Sean McGivern2017-01-091-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Introduce EXCLUDED_WATCHER_EVENTS to exclude eventsremove-successful-pipeline-emails-for-nowLin Jen-Shin2017-01-051-0/+4
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+4
* | | | | | | | | | Merge branch 'speed-up-group-milestone-index' into 'master' Sean McGivern2017-01-064-6/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Speed up group milestone index by passing group_id to IssuesFinderAdam Niedzielski2017-01-064-6/+46
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available...Fatih Acet2017-01-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | prevent 500 error when selecting changes tab for non-existent branchMike Greiling2017-01-031-1/+1
* | | | | | | | | | Absorb gitlab_gitRobert Speicher2017-01-041-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-041-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add email and password confirmation fields to registration formDrew Blessing2017-01-031-0/+1
* | | | | | | | | | Merge branch 'rs-remove-unused-method' into 'master' Douwe Maan2017-01-041-4/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-methodRobert Speicher2017-01-031-4/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-0314-31/+27
|/ / / / / / / /
* | | | | | | | Merge branch 'issue_22664' into 'master' Sean McGivern2016-12-291-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-271-3/+3
| * | | | | | | | Fix issuable assignee update bug when previous assignee is nullFelipe Artur2016-12-201-3/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' Sean McGivern2016-12-291-5/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ...Gabriel Gizotti2016-12-281-5/+1
* | | | | | | | | Merge branch 'dz-nested-group-access' into 'master' Dmitriy Zaporozhets2016-12-291-4/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Improve Group#users_with_parents methoddz-nested-group-accessDmitriy Zaporozhets2016-12-291-1/+1
| * | | | | | | | Include group parents into read access for project and groupDmitriy Zaporozhets2016-12-261-4/+14
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' into 'dz-rename-reserved-project-names'Dmitriy Zaporozhets2016-12-2710-22/+114
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-272-4/+18
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2046-249/+811
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge CSSFilipa Lacerda2016-12-1219-174/+275
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0632-412/+312
| | |\ \ \ \ \ \ \ \ \