summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update changelogosw-updates-merge-status-on-api-actionsOswaldo Ferreira2018-01-231-1/+1
* Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-234-1/+39
* Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-227-2/+47
|\
| * Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-212-0/+20
| * Fix error on empty query for Members APIMark Fletcher2018-01-215-2/+27
* | Merge branch 'feat/add-section-headers-to-plus-button-dropdown' into 'master'Annabel Dunstone Gray2018-01-222-0/+9
|\ \
| * | Add section headers to plus button dropdownGeorge Tsiolis2018-01-192-0/+9
* | | Merge branch '41208-commit-atom-feeds-double-escaped' into 'master'Douwe Maan2018-01-223-3/+14
|\ \ \
| * | | Allows html in commits atom feedJacopo2018-01-223-3/+14
* | | | Merge branch 'docs/refactor-k8s-cluster' into 'master'Marcia Ramos2018-01-222-45/+241
|\ \ \ \
| * | | | Copy k8s service integration info into clustersAchilleas Pipinellis2018-01-222-66/+171
| * | | | Port the cluster docs from EE to CEAchilleas Pipinellis2018-01-221-41/+132
* | | | | Update VERSION to 10.5.0-prev10.5.0.preLuke Bennett2018-01-221-1/+1
* | | | | Update CHANGELOG.md for 10.4.0Luke Bennett2018-01-22138-695/+164
* | | | | Merge branch '42212-order-of-steps-in-auto-devops-do' into 'master'Achilleas Pipinellis2018-01-221-28/+28
|\ \ \ \ \
| * | | | | Change order of jobs in Auto DevOps doc42212-order-of-steps-in-auto-devops-doFabio Busatto2018-01-191-28/+28
* | | | | | Merge branch 'vue-mr-widget-state' into 'master'Phil Hughes2018-01-224-69/+89
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2271-86/+198
| |\ \ \ \ \
| * | | | | | Update icon to match EEvue-mr-widget-stateFilipa Lacerda2018-01-191-1/+1
| * | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-19205-2516/+3797
| |\ \ \ \ \ \
| * | | | | | | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-185-69/+92
* | | | | | | | Merge branch 'docs/dast-cleanup' into 'master'Marcia Ramos2018-01-221-8/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add more info on how DAST worksAchilleas Pipinellis2018-01-221-8/+13
* | | | | | | | | Merge branch 'patch-19' into 'master'Rémy Coutable2018-01-221-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | typo fixBen Bodenmiller2018-01-181-1/+1
* | | | | | | | | Merge branch 'split-setup-test-env' into 'master'Rémy Coutable2018-01-221-3/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Split the setup-test-env job in twoNick Thomas2018-01-191-3/+16
* | | | | | | | | | Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2212-15/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1912-15/+15
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-222-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | _never_ unset gitlab.full_pathgitaly-write-repo-config-prepKim "BKC" Carlbäcker2018-01-191-2/+2
| * | | | | | | | | | Move rugged-call from Project#write_repository_config to Git::Repository#writ...Kim "BKC" Carlbäcker2018-01-192-1/+5
* | | | | | | | | | | Merge branch '42231-protected-branches-api-route-returns-404-for-branches-wit...Rémy Coutable2018-01-223-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix protected branches API to accept name parameter with dotMark Fletcher2018-01-193-1/+12
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '41814-text-decoration-skip' into 'master'Phil Hughes2018-01-222-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Disable scss-lint around text-decoration-skip41814-text-decoration-skipAnnabel Dunstone Gray2018-01-181-3/+3
| * | | | | | | | | | | Add text-decoration-skip: ink to all underlined elementsAnnabel Dunstone Gray2018-01-182-1/+12
* | | | | | | | | | | | Merge branch '42206-permit-password-for-git-param' into 'master'Rémy Coutable2018-01-223-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Permits 'password_authentication_enabled_for_git' parameter for ApplicationSe...Mark Fletcher2018-01-193-0/+13
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'update-auto-devops-template' into 'master'Rémy Coutable2018-01-221-2/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update Auto DevOps templateupdate-auto-devops-templateAchilleas Pipinellis2018-01-191-2/+40
* | | | | | | | | | | | Merge branch 'qa/rs-remove-login-wait' into 'master'Grzegorz Bizon2018-01-201-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove the wait time for the login form checkqa/rs-remove-login-waitRobert Speicher2018-01-191-7/+9
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'Clement Ho2018-01-206-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Fix Shows signin tab after new user email confirmationJacopo2018-01-186-5/+19
* | | | | | | | | | | Merge branch 'docs/ci-quick-start-typo' into 'master'Marcia Ramos2018-01-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update outdated docs for CI/CD quick startdocs/ci-quick-start-typoAchilleas Pipinellis2018-01-191-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-01-191-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update best_practices.mdAnwar El Wakil2018-01-191-1/+0
* | | | | | | | | | | | Merge branch 'spelling' into 'master'Achilleas Pipinellis2018-01-1936-46/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |