summaryrefslogtreecommitdiff
Commit message (Collapse)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
| | | | | | * Limitation of DB_INITIALIZE (run once) * helm hooks * Examples
* Process $DB_INITIALIZE and $DB_MIGRATE variablesThong Kuah2018-09-272-20/+58
| | | | | | | | | | if $DB_INITIALIZE is present, deploy an initial release where only $DB_INITIALIZE is run in a special job (and deployments are not rendered/loaded). This is then followed by second release with deployments as usual. if $DB_MIGRATE, set this value which will trigger a pre-upgrade helm hook.
* 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-yml for the last time See merge request gitlab-org/gitlab-ce!21929
| * Update all gitlab ci templates from gitlab-org/gitlab-ci-yml50289-vendor-ci-yml-for-the-last-timeDylan Griffith2018-09-275-19/+87
| | | | | | | | | | | | Since we no longer maintain this separate repo we just needed to do one final copy from there. See https://gitlab.com/gitlab-org/gitlab-ce/issues/50289
* | Merge branch 'docs/linting-section' into 'master'Marcia Ramos2018-09-272-3/+106
|\ \ | | | | | | | | | | | | Add linting section to documentation guidelines See merge request gitlab-org/gitlab-ce!21849
| * | 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.md See merge request gitlab-org/gitlab-ce!21927
| * | | 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. See merge request gitlab-org/gitlab-ce!21923
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added `chown git` to the backup tar to prevent permission denied errors. See merge request gitlab-org/gitlab-ce!21724
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Port (Refactor IDE to allow RightPane extension) See merge request gitlab-org/gitlab-ce!21920
| * | | | | Refactor IDE to allow RightPane extensionide-refactor-for-ee-specificPaul Slaughter2018-09-263-53/+59
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** - This is needed by the Web Terminal EE feature. https://gitlab.com/gitlab-org/gitlab-ee/issues/5426 **Notes:** - RightPane component tabs is now data driven.
* | | | | Merge branch '50904-update-scroll-utils' into 'master'Phil Hughes2018-09-274-10/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Extracts scroll position checks into reusable functions See merge request gitlab-org/gitlab-ce!21931
| * | | | | Extracts scroll position checks into reusable functions50904-update-scroll-utilsFilipa Lacerda2018-09-264-10/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new Job Log page in Vue, we'll need to reuse the same functions for scrolling that we're using in the jQuery one. This page extracts that logic into reusable functions
* | | | | | 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 token See merge request gitlab-org/gitlab-ce!21934
| * | | | | | Guard against a login attempt with invalid CSRF tokensh-guard-against-ldap-login-csrf-failStan Hu2018-09-262-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user logs in with a bad CSRF token, the Warden before_logout hook will be called with no valid user. This would lead to odd Error 500 messages with a backtrace. Addresses part of #50857
* | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds css classes to aid GitLab-QA tests See merge request gitlab-org/gitlab-ce!21935
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow events filter to be set in the URL in addition to cookie Closes #1801 See merge request gitlab-org/gitlab-ce!21557
| * | | | | | | | Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-urlRémy Coutable2018-09-269-110/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | 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 prop Closes #51569 See merge request gitlab-org/gitlab-ce!21887
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vue, vue-template-compiler, and vue-loader See merge request gitlab-org/gitlab-ce!21891
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/vuejs/vue/releases most relevant release notes are in the 2.5.17 beta post: https://github.com/vuejs/vue/releases/tag/v2.5.17-beta.0
* | | | | | | | | Merge branch 'docs/remove-doctoc-frontmatter' into 'master'Achilleas Pipinellis2018-09-274-122/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove DocToc frontmatter from published pages See merge request gitlab-org/gitlab-ce!21944
| * | | | | | | | | Remove DocToc frontmatter from published pagesdocs/remove-doctoc-frontmatterEvan Read2018-09-274-122/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also fix some markdown syntax.
* | | | | | | | | | Merge branch 'docs/fix-mitmproxy-link' into 'master'Achilleas Pipinellis2018-09-271-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to mitmproxy installation See merge request gitlab-org/gitlab-ce!21947
| * | | | | | | | | | Fix link to mitmproxy installationdocs/fix-mitmproxy-linkEvan Read2018-09-271-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch ↵Stan Hu2018-09-273-2/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '51522-add-new-project-via-import-by-url-auto-populates-slug-but-not-project-name' into 'master' Resolve "Add new project via import by URL auto populates slug but not project name" Closes #51522 See merge request gitlab-org/gitlab-ce!21770
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix monitoring dashboard not resizing properly See merge request gitlab-org/gitlab-ce!21730
| * | | | | | | | | | 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 ↵Jose Vargas2018-09-251810-10009/+17156
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jivl-fix-monitoring-dashboard-resizing-navbar
| * | | | | | | | | | | Fix monitoring dashboard not working properlyJose Vargas2018-09-255-47/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug when the monitoring dashboard wouldn't redraw for when the sidebar was collapsed/expanded on medium to small screens. This is done by enforcing vue to update based on the change of a key
* | | | | | | | | | | | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-263-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update grape to 1.1.0 to address a XSS vulnerability Closes #51299 See merge request gitlab-org/gitlab-ce!21639
| * | | | | | | | | | | | Update grape to 1.1.0 to address a XSS vulnerability51299-update-grapeRémy Coutable2018-09-103-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/ruby-grape/grape/blob/master/CHANGELOG.md#110-842018. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51299. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'jivl-fix-missing-import-skeleton-notes' into 'master'Clement Ho2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import statement for the skeleton notes See merge request gitlab-org/gitlab-ce!21940
| * | | | | | | | | | | | | 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 notation See merge request gitlab-org/gitlab-ce!21937
| * | | | | | | | | | | | | Bump GitLab UI version and change the file imports to a single point of ↵jivl-bump-gitlab-uiJose Vargas2018-09-2610-23/+24
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entry notation
* | | | | | | | | | | | | Merge branch 'winh-page-title-margin' into 'master'Annabel Dunstone Gray2018-09-262-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change vertical margin of page titles to 16px See merge request gitlab-org/gitlab-ce!21888
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature: Runner type filter for admin view See merge request gitlab-org/gitlab-ce!19649