summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Minor doc update for auto devops db migrations48004-db-initialize-migrateDylan Griffith2018-10-021-1/+3
* Document how to use DB_INITIALIZE and DB_MIGRATEThong Kuah2018-10-021-0/+25
* Process $DB_INITIALIZE and $DB_MIGRATE variablesThong Kuah2018-09-272-20/+58
* Merge branch '50289-vendor-ci-yml-for-the-last-time' into 'master'Kamil Trzciński2018-09-275-19/+87
|\
| * Update all gitlab ci templates from gitlab-org/gitlab-ci-yml50289-vendor-ci-yml-for-the-last-timeDylan Griffith2018-09-275-19/+87
* | Merge branch 'docs/linting-section' into 'master'Marcia Ramos2018-09-272-3/+106
|\ \
| * | Add linting section to documentation guidelinesdocs/linting-sectionEvan Read2018-09-262-3/+106
* | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-09-271-2/+2
|\ \ \
| * | | Update using_docker_build.mdCauan Cabral2018-09-271-2/+2
|/ / /
* | | Merge branch 'mr-api-diff-refs-doc' into 'master'Rémy Coutable2018-09-271-0/+5
|\ \ \
| * | | Add diff_refs documentation in single merge requests response.Patrizio Bonzani2018-09-261-0/+5
* | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-09-271-1/+2
|\ \ \ \
| * | | | Move chown *after* cpCraig Fisher2018-09-271-1/+1
| * | | | Added `chown git` to the backup tar to prevent permission denied errors.Craig Fisher2018-09-131-1/+2
* | | | | Merge branch 'ide-refactor-for-ee-specific' into 'master'Phil Hughes2018-09-273-53/+59
|\ \ \ \ \
| * | | | | Refactor IDE to allow RightPane extensionide-refactor-for-ee-specificPaul Slaughter2018-09-263-53/+59
| | |_|/ / | |/| | |
* | | | | Merge branch '50904-update-scroll-utils' into 'master'Phil Hughes2018-09-274-10/+40
|\ \ \ \ \
| * | | | | Extracts scroll position checks into reusable functions50904-update-scroll-utilsFilipa Lacerda2018-09-264-10/+40
* | | | | | Merge branch 'sh-guard-against-ldap-login-csrf-fail' into 'master'Rémy Coutable2018-09-272-0/+10
|\ \ \ \ \ \
| * | | | | | Guard against a login attempt with invalid CSRF tokensh-guard-against-ldap-login-csrf-failStan Hu2018-09-262-0/+10
* | | | | | | Merge branch 'qa-257-group-saml-sso-ce-pre-req' into 'master'40085-add-a-create_merge_request-quick-action-2Rémy Coutable2018-09-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Added css class to aid gitlab-qa testsqa-257-group-saml-sso-ce-pre-reqsliaquat2018-09-261-1/+1
* | | | | | | | Merge branch '1801-allow-event_filter-to-be-set-in-the-url' into 'master'Douwe Maan2018-09-2710-109/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-urlRémy Coutable2018-09-269-110/+147
| * | | | | | | | Allow events filter to be set in the URL in addition to cookieIgor Kapkov2018-09-262-0/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '51569-performance-bar' into 'master'50904-stages-dropdownPhil Hughes2018-09-273-13/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes performance bar looking for a key in a undefined propFilipa Lacerda2018-09-273-13/+31
|/ / / / / / / /
* | | | | | | | Merge branch 'update-vuejs-dependencies' into 'master'Phil Hughes2018-09-272-18/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Dedupe vue versions in yarn.lockupdate-vuejs-dependenciesMike Greiling2018-09-261-13/+2
| * | | | | | | | Upgrade vue-loader from 15.2.4 to 15.4.2Mike Greiling2018-09-262-10/+14
| * | | | | | | | Upgrade vuejs from 2.5.16 to 2.5.17Mike Greiling2018-09-262-3/+14
* | | | | | | | | Merge branch 'docs/remove-doctoc-frontmatter' into 'master'Achilleas Pipinellis2018-09-274-122/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove DocToc frontmatter from published pagesdocs/remove-doctoc-frontmatterEvan Read2018-09-274-122/+41
* | | | | | | | | | Merge branch 'docs/fix-mitmproxy-link' into 'master'Achilleas Pipinellis2018-09-271-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix link to mitmproxy installationdocs/fix-mitmproxy-linkEvan Read2018-09-271-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '51522-add-new-project-via-import-by-url-auto-populates-slug-but...Stan Hu2018-09-273-2/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Removes the 'required' attribute from the 'project name' field51522-add-new-project-via-import-by-url-auto-populates-slug-but-not-project-nameMartin Wortschack2018-09-173-2/+7
* | | | | | | | | | Merge branch 'jivl-fix-monitoring-dashboard-resizing-navbar' into 'master'Mike Greiling2018-09-265-47/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change forceRedraw key formatjivl-fix-monitoring-dashboard-resizing-navbarJose Vargas2018-09-252-5/+5
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into jivl-fix-monito...Jose Vargas2018-09-251810-10009/+17156
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix monitoring dashboard not working properlyJose Vargas2018-09-255-47/+66
* | | | | | | | | | | | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-263-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update grape to 1.1.0 to address a XSS vulnerability51299-update-grapeRémy Coutable2018-09-103-7/+7
* | | | | | | | | | | | | Merge branch 'jivl-fix-missing-import-skeleton-notes' into 'master'Clement Ho2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix import statement for the skeleton notesJose Vargas2018-09-261-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jivl-bump-gitlab-ui' into 'master'Clement Ho2018-09-2610-23/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bump GitLab UI version and change the file imports to a single point of entry...jivl-bump-gitlab-uiJose Vargas2018-09-2610-23/+24
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'winh-page-title-margin' into 'master'Annabel Dunstone Gray2018-09-262-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Change vertical margin of page titles to 16pxwinh-page-title-marginWinnie Hellmann2018-09-262-1/+6
* | | | | | | | | | | | | Merge branch 'feature/runner-type-filter-for-admin-view' into 'master'Kamil Trzciński2018-09-2611-83/+344
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |