Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security' | Robert Speicher | 2017-01-12 | 7 | -159/+143 |
* | Merge branch 'use-configured-git' into 'master' | Douwe Maan | 2017-01-12 | 1 | -1/+1 |
|\ | |||||
| * | Use configured git rather than system gituse-configured-git | Robert Schilling | 2017-01-05 | 1 | -1/+1 |
* | | Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-button | Sean McGivern | 2017-01-12 | 1 | -0/+6 |
|\ \ | |||||
| * | | Add support for PlantUML diagrams in Asciidoc. | Horacio Sanson | 2017-01-12 | 1 | -0/+6 |
* | | | New error message recreating projects on pending deletefix/project-delete-tooltip | James Lopez | 2017-01-11 | 2 | -0/+30 |
|/ / | |||||
* | | Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master' | Sean McGivern | 2017-01-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analytics | Toon Claes | 2017-01-09 | 1 | -1/+1 |
* | | | Merge branch 'auto-pipelines-vue' into 'master' | Fatih Acet | 2017-01-09 | 1 | -2/+10 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-09 | 7 | -7/+55 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into auto-pipelines-vue | Filipa Lacerda | 2017-01-05 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-04 | 14 | -35/+28 |
| |\ \ \ \ | |||||
| * \ \ \ \ | fix pipelines/index.html.haml merge conflict | Regis | 2017-01-02 | 11 | -35/+134 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-12-24 | 2 | -3/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge master and fix application.rb conflict | Regis | 2016-12-23 | 9 | -19/+56 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add specs for pipeline entity and improve factory | Grzegorz Bizon | 2016-12-21 | 1 | -0/+4 |
| * | | | | | | | | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-21 | 27 | -126/+465 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-12-16 | 24 | -149/+229 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Improve performance of Pipelines API | Kamil Trzcinski | 2016-12-15 | 1 | -2/+6 |
* | | | | | | | | | | | Merge branch 'label-length-validation' into 'master' | Rémy Coutable | 2017-01-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | validate length of label.title | Tomáš Kukrál | 2017-01-09 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'remove-project-authorizations-id-column' into 'master' | Douwe Maan | 2017-01-09 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Remove the project_authorizations.id columnremove-project-authorizations-id-column | Yorick Peterse | 2017-01-08 | 2 | -3/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' | Sean McGivern | 2017-01-09 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Introduce EXCLUDED_WATCHER_EVENTS to exclude eventsremove-successful-pipeline-emails-for-now | Lin Jen-Shin | 2017-01-05 | 1 | -0/+4 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' | Sean McGivern | 2017-01-09 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Record and show last used date of SSH Keys | Vincent Wong | 2017-01-09 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'speed-up-group-milestone-index' into 'master' | Sean McGivern | 2017-01-06 | 4 | -6/+46 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Speed up group milestone index by passing group_id to IssuesFinder | Adam Niedzielski | 2017-01-06 | 4 | -6/+46 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available... | Fatih Acet | 2017-01-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | prevent 500 error when selecting changes tab for non-existent branch | Mike Greiling | 2017-01-03 | 1 | -1/+1 |
* | | | | | | | | | | Absorb gitlab_git | Robert Speicher | 2017-01-04 | 1 | -1/+1 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'add_email_password_confirmation' into 'master' | Douwe Maan | 2017-01-04 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add email and password confirmation fields to registration form | Drew Blessing | 2017-01-03 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'rs-remove-unused-method' into 'master' | Douwe Maan | 2017-01-04 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-method | Robert Speicher | 2017-01-03 | 1 | -4/+0 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-path | James Lopez | 2017-01-03 | 14 | -31/+27 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'issue_22664' into 'master' | Sean McGivern | 2016-12-29 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check if user can read issue before being assignedissue_22664 | Felipe Artur | 2016-12-27 | 1 | -3/+3 |
| * | | | | | | | | Fix issuable assignee update bug when previous assignee is null | Felipe Artur | 2016-12-20 | 1 | -3/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' | Sean McGivern | 2016-12-29 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ... | Gabriel Gizotti | 2016-12-28 | 1 | -5/+1 |
* | | | | | | | | | Merge branch 'dz-nested-group-access' into 'master' | Dmitriy Zaporozhets | 2016-12-29 | 1 | -4/+14 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Improve Group#users_with_parents methoddz-nested-group-access | Dmitriy Zaporozhets | 2016-12-29 | 1 | -1/+1 |
| * | | | | | | | | Include group parents into read access for project and group | Dmitriy Zaporozhets | 2016-12-26 | 1 | -4/+14 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' into 'dz-rename-reserved-project-names' | Dmitriy Zaporozhets | 2016-12-27 | 10 | -22/+114 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' | Douwe Maan | 2016-12-27 | 2 | -4/+18 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-12-20 | 46 | -249/+811 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge CSS | Filipa Lacerda | 2016-12-12 | 19 | -174/+275 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-12-06 | 32 | -412/+312 |
| | |\ \ \ \ \ \ \ \ \ |