summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Upgrade Jquerytz-upgrade-jquery-another-roundTim Zallmann2018-01-222-4/+8
* 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: Spelling fixesVille Skyttä2018-01-1936-46/+46
* | | | | | | | | | | Merge branch 'fix/add-horizontal-scroll-to-wiki-tables' into 'master'Annabel Dunstone Gray2018-01-192-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add horizontal scroll to wiki tablesGeorge Tsiolis2018-01-192-0/+7
* | | | | | | | | | | | Merge branch 'fix_change_log_doc' into 'master'Robert Speicher2018-01-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixes mistake in change log doc.Tom Bosmans2018-01-181-2/+2
* | | | | | | | | | | | Merge branch 'fix-redirect-routes-schema' into 'master'Yorick Peterse2018-01-194-3/+76
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Rework indexes on redirect_routes to be more effective and enforce a case ins...fix-redirect-routes-schemaGreg Stark2018-01-184-3/+76
* | | | | | | | | | | | Merge branch 'mr-widget-vue' into 'master'Phil Hughes2018-01-195-39/+60
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix conflict with ee iconmr-widget-vueFilipa Lacerda2018-01-181-1/+1
| * | | | | | | | | | | | Move archived component to vue fileFilipa Lacerda2018-01-185-39/+60
* | | | | | | | | | | | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-1917-94/+288
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Initial work to add notification reason to emailsMario de la Ossa2018-01-1617-94/+288
* | | | | | | | | | | | | | Merge branch 'sh-fix-authorized-keys-docs' into 'master'Nick Thomas2018-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix incorrect path for gitlab-shell authorized keys helpersh-fix-authorized-keys-docsStan Hu2018-01-181-1/+1
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '26296-update-styling-disabled-buttons' into 'master'Phil Hughes2018-01-196-19/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \