summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10-6-stable' into 10-6-stable-frozen10-6-stable-frozenJames Lopez2018-03-121-0/+42
|\
| * Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-0811-59/+197
| * Merge branch 'sh-fix-update-service' into 'master'James Lopez2018-03-082-1/+10
* | Merge branch 'sh-fix-update-service' into 'master'James Lopez2018-03-082-1/+10
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 10-6-stable-frozenJames Lopez2018-03-08256-1375/+4460
|\ \ | |/ |/|
| * Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-0811-15/+98
| |\
| | * Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-084-2/+54
| | * Service integration displays validation errors on test failJames Edwards-Jones2018-03-073-13/+29
| | * Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-075-0/+15
| * | Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-087-116/+95
| |\ \
| | * | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-077-116/+95
| * | | Merge branch 'bvl-port-ee-improvements-from-maintainer-push' into 'master'Douwe Maan2018-03-086-18/+32
| |\ \ \
| | * | | Validate `:push_code` before checking protected branchesbvl-port-ee-improvements-from-maintainer-pushBob Van Landuyt2018-03-081-6/+3
| | * | | Address frontend feedbackBob Van Landuyt2018-03-085-12/+29
| |/ / /
| * | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-076-32/+60
| |\ \ \
| | * | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-076-32/+60
| * | | | Merge branch 'da-update-project-activity' into 'master'Stan Hu2018-03-072-1/+13
| |\ \ \ \
| | * | | | Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-072-1/+13
| * | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-0711-59/+194
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-07120-275/+1694
| | |\ \ \ \ \
| | * | | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-0711-94/+214
| * | | | | | | Merge branch 'docs-fe-typo' into 'master'Jacob Schatz2018-03-071-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix accessibility typodocs-fe-typoClement Ho2018-03-071-1/+1
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'backport-ee-3892-to-ce' into 'master'Douwe Maan2018-03-072-0/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/mer...backport-ee-3892-to-ceTiago Botelho2018-03-072-0/+11
| * | | | | | | | Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master'Clement Ho2018-03-074-45/+53
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Move SidebarAssignees vue componentGeorge Tsiolis2018-03-074-45/+53
| * | | | | | | | Merge branch '43780-add-a-paragraph-about-clusters-security-implications' int...Kamil Trzciński2018-03-073-3/+50
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Resolve "Add a mention and link to doc for security implications in the Kuber...Mayra Cabrera2018-03-073-3/+50
| |/ / / / / / /
| * | | | | | | Merge branch 'docs-new-fe-guide' into 'master'Jacob Schatz2018-03-0718-0/+111
| |\ \ \ \ \ \ \
| | * | | | | | | Add new frontend guide structureClement Ho2018-03-0718-0/+111
| * | | | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-0758-118/+911
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-074-15/+33
| | * | | | | | | | Link correct project when adding file to empty MRBob Van Landuyt2018-03-071-1/+1
| | * | | | | | | | Use Project#source_of_merge_requests-relationBob Van Landuyt2018-03-071-1/+1
| | * | | | | | | | Limit queries to a user-branch combinationBob Van Landuyt2018-03-078-65/+109
| | * | | | | | | | Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-076-3/+18
| | * | | | | | | | Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-075-30/+65
| | * | | | | | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-0719-79/+247
| | * | | | | | | | Allow maintainers to push to a single branchBob Van Landuyt2018-03-072-1/+40
| | * | | | | | | | Allow abilities on forks while MR is openBob Van Landuyt2018-03-076-3/+138
| | * | | | | | | | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-0722-4/+324
| | * | | | | | | | Add `allow_maintainer_to_push` to `merge_requests`Bob Van Landuyt2018-03-072-0/+19
| * | | | | | | | | Merge branch 'pages-0-7-0' into 'master'Grzegorz Bizon2018-03-071-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into 'pages-0-7-0'Grzegorz Bizon2018-03-0740-172/+700
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Update GitLab Pages to v0.7.0Nick Thomas2018-03-071-1/+1
| * | | | | | | | | | Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho2018-03-072-1/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4pxLukas Eipert2018-03-052-1/+6
| * | | | | | | | | | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-072-6/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-062-6/+7
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |