summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set initial password if promptedqa-fix-register-spec-failureMark Lapierre2018-09-271-0/+1
| | | | | Fabricating a user might be the first action in the first test. If so, set the initial password
* Merge branch '50904-api-adjustments-components' into 'master'Phil Hughes2018-09-2710-166/+159
|\ | | | | | | | | Updates Vue job components to match new API See merge request gitlab-org/gitlab-ce!21930
| * Updates Vue job components to match new APIFilipa Lacerda2018-09-2710-166/+159
|/
* Merge branch 'docs-fix-gitlab-capitalization-ce' into 'master'Marcia Ramos2018-09-2716-25/+25
|\ | | | | | | | | Correcting Gitlab to GitLab in docs See merge request gitlab-org/gitlab-ce!21827
| * Correct Gitlab to GitLab in docsMarcel Amirault2018-09-2516-25/+25
| |
* | Merge branch '51925-expose-has_trace-in-job-api' into 'master'Kamil Trzciński2018-09-274-1/+27
|\ \ | | | | | | | | | | | | | | | | | | Add has_trace to `Projects::JobController#show.json` Closes #51925 See merge request gitlab-org/gitlab-ce!21950
| * | Add has_trace to Projects::JobController#show.jsonSteve Azzopardi2018-09-274-1/+27
| | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51925
* | | Merge branch '43832-adds-chdmod-to-commits-actions-api' into 'master'Rémy Coutable2018-09-278-19/+142
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allows to work with execute permissions in GitLab API Closes #43832 See merge request gitlab-org/gitlab-ce!21866
| * | | Adds chmod action to POST /projects/:id/repository/commits APIJacopo2018-09-278-19/+142
| | | | | | | | | | | | | | | | With this action the user can update the execute_filemode of a given file in the repository.
* | | | Merge branch 'feature/add-public-email-to-users-api' into 'master'Rémy Coutable2018-09-277-61/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/add public email to users api Closes #39346 See merge request gitlab-org/gitlab-ce!21909
| * | | | add changelogAlexis Reigel2018-09-271-0/+5
| | | | |
| * | | | add user's public_email attribute to apiAlexis Reigel2018-09-276-1/+14
| | | | |
| * | | | add missing user attributes to api docsAlexis Reigel2018-09-273-60/+80
| | | | |
* | | | | Merge branch 'toon-copy-meta-data-fix' into 'master'Rémy Coutable2018-09-273-2/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow /copy_metadata for new issues Closes #50181 See merge request gitlab-org/gitlab-ce!21953
| * | | | | Allow /copy_metadata for new issuesToon Claes2018-09-273-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50181
* | | | | | Merge branch 'docs-community-roles' into 'master'Rémy Coutable2018-09-272-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document community roles See merge request gitlab-org/gitlab-ce!21513
| * | | | | | Document community rolesRay Paik2018-09-272-1/+15
|/ / / / / /
* | | | | | 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