Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve failures in GitHub-ish import controller specsrs-pick-security | Robert Speicher | 2018-02-09 | 1 | -4/+4 |
| | |||||
* | Remove changelogs for already-released security patches | Robert Speicher | 2018-02-09 | 4 | -20/+0 |
| | |||||
* | Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4' | Kamil Trzciński | 2018-02-09 | 5 | -9/+25 |
| | | | | Fix using wildcards in protected tags to expose protected variables | ||||
* | Merge branch 'fix/gh-namespace-issue' into 'security-10-4' | James Lopez | 2018-02-09 | 6 | -29/+87 |
| | | | | [10.4] Fix GH namespace security issue | ||||
* | Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into ↵ | Robert Speicher | 2018-02-09 | 5 | -2/+19 |
| | | | | | | 'security-10-4' Restrict Todo API mark_as_done endpoint to the user's todos only | ||||
* | Merge branch 'fix-mermaid-xss' into 'security-10-4' | Douwe Maan | 2018-02-09 | 9 | -15/+130 |
| | | | | [10.4] Fix stored XSS in code blocks | ||||
* | Merge branch ↵ | Douwe Maan | 2018-02-09 | 9 | -75/+410 |
| | | | | | | 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' [Port for security-10-4]: Makes SnippetFinder ensure feature visibility | ||||
* | Merge branch 'doc-improve-side-effects-block' into 'master' | Phil Hughes | 2018-02-09 | 1 | -2/+31 |
|\ | | | | | | | | | Improve docs about allowing some side effects on the constructor See merge request gitlab-org/gitlab-ce!17027 | ||||
| * | Fix english in style_guide_js.mddoc-improve-side-effects-block | Filipa Lacerda | 2018-02-09 | 1 | -2/+2 |
| | | |||||
| * | Improve docs about allowing some side effects on the constructor | Filipa Lacerda | 2018-02-09 | 1 | -2/+31 |
| | | |||||
* | | Merge branch 'sh-add-docker-build-qa' into 'master' | Grzegorz Bizon | 2018-02-09 | 1 | -0/+10 |
|\ \ | | | | | | | | | | | | | Add documentation on how to build a QA Docker image See merge request gitlab-org/gitlab-ce!17036 | ||||
| * | | Add documentation on how to build a QA Docker imagesh-add-docker-build-qa | Stan Hu | 2018-02-09 | 1 | -0/+10 |
|/ / | |||||
* | | Merge branch 'qa/gb/do-not-require-test-network-in-pipeline-tests' into 'master' | Robert Speicher | 2018-02-09 | 2 | -2/+12 |
|\ \ | | | | | | | | | | | | | | | | | | | Do not attach runner to a non-exsiting network in QA Closes gitlab-qa#180 See merge request gitlab-org/gitlab-ce!17028 | ||||
| * | | Do not attach runner to a non-exsiting network in QAqa/gb/do-not-require-test-network-in-pipeline-tests | Grzegorz Bizon | 2018-02-09 | 2 | -2/+12 |
| |/ | |||||
* | | Merge branch 'qa-allow-setting-sandbox-group' into 'master' | Grzegorz Bizon | 2018-02-09 | 4 | -3/+23 |
|\ \ | | | | | | | | | | | | | Allow using a different sandbox group for QA See merge request gitlab-org/gitlab-ce!17000 | ||||
| * \ | Merge remote-tracking branch 'upstream/master' into ↵ | Lin Jen-Shin | 2018-02-09 | 107 | -559/+2399 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qa-allow-setting-sandbox-group * upstream/master: (27 commits) Set initial password for instance in LDAP QA test Backport EE changes to some hashed storage documentation to CE Remove allow_n_plus_1 from Git::Repository#branches_filter Bumps Gitlab Shell version to 6.0.3 Make resetting column information overridable in EE Added 'clear' button to ci lint editor Issues and merge requests in subgroups docs Update docs labels CE Refactored merge_requests/show path in dispatcher.js wording don't check against a hardcoded user name 10.5 Update the dependencies license list 10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates Create update guide for 10.5 Update 10.5 source install guide Add docs for MR link in commit page Add groups to OpenID Connect claims Replaced $.get with axois.get Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly [docs] Info rescheduling background migrations ... | ||||
| * | | Move all ENV to Runtime::Env | Lin Jen-Shin | 2018-02-09 | 3 | -3/+15 |
| | | | |||||
| * | | Allow using a different sandbox group for QA | Lin Jen-Shin | 2018-02-08 | 2 | -1/+9 |
| | | | |||||
* | | | Merge branch 'fl-mr-widget-missing-branch' into 'master' | Phil Hughes | 2018-02-09 | 4 | -69/+72 |
|\ \ \ | | | | | | | | | | | | | | | | | Moves missing branch into a vue file See merge request gitlab-org/gitlab-ce!17016 | ||||
| * | | | Remove not needed default statement | Filipa Lacerda | 2018-02-09 | 1 | -1/+0 |
| | | | | |||||
| * | | | Moves missing branch into a vue filefl-mr-widget-missing-branch | Filipa Lacerda | 2018-02-08 | 4 | -69/+73 |
| | | | | |||||
* | | | | Merge branch 'axios-post-importer' into 'master' | Filipa Lacerda | 2018-02-09 | 13 | -176/+328 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Replace $.post in importer status with axios See merge request gitlab-org/gitlab-ce!16692 | ||||
| * | | | | Replace $.post in importer status with axios | Clement Ho | 2018-02-09 | 13 | -176/+328 |
|/ / / / | |||||
* | | | | Merge branch 'docs/update-vue-naming-guidelines' into 'master' | Phil Hughes | 2018-02-09 | 2 | -5/+10 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Update vue component naming guidelines See merge request gitlab-org/gitlab-ce!17018 | ||||
| * | | | Update vue component naming guidelines | George Tsiolis | 2018-02-08 | 2 | -5/+10 |
| |/ / | |||||
* | | | Merge branch 'sh-ldap-set-first-password-qa' into 'master' | Grzegorz Bizon | 2018-02-09 | 1 | -9/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | Set initial password for instance in LDAP QA test See merge request gitlab-org/gitlab-ce!17024 | ||||
| * | | | Set initial password for instance in LDAP QA testsh-ldap-set-first-password-qa | Stan Hu | 2018-02-08 | 1 | -9/+16 |
| | | | | | | | | | | | | | | | | | | | | For a new instance, the root password needs to be set, regardless of whether LDAP is enabled. | ||||
* | | | | Merge branch '42896-hashed-storage-beta-docs' into 'master' | Stan Hu | 2018-02-09 | 1 | -39/+52 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Resolve "Hashed storage is now beta" Closes #42896 See merge request gitlab-org/gitlab-ce!17015 | ||||
| * | | | Backport EE changes to some hashed storage documentation to CE | Nick Thomas | 2018-02-08 | 1 | -39/+52 |
| |/ / | |||||
* | | | Merge branch 'fix/remove-n-plus-one-from-branches-filter' into 'master' | Robert Speicher | 2018-02-08 | 1 | -11/+8 |
|\ \ \ | |/ / |/| | | | | | | | | Remove allow_n_plus_1 from Git::Repository#branches_filter See merge request gitlab-org/gitlab-ce!17012 | ||||
| * | | Remove allow_n_plus_1 from Git::Repository#branches_filter | Ahmad Sherif | 2018-02-08 | 1 | -11/+8 |
|/ / | |||||
* | | Merge branch '40744-hashed-storage-specs' into 'master' | Sean McGivern | 2018-02-08 | 36 | -254/+349 |
|\ \ | | | | | | | | | | | | | | | | | | | Use hashed storage in the specs Closes #40744 See merge request gitlab-org/gitlab-ce!15681 | ||||
| * | | Use hashed storage in the specs40744-hashed-storage-specs | Nick Thomas | 2018-02-07 | 36 | -254/+349 |
| | | | |||||
* | | | Merge branch '4852-migration-specs-fail-locally-if-no-geo-db-is-configured' ↵ | Nick Thomas | 2018-02-08 | 1 | -2/+7 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Make resetting column information overridable in EE See merge request gitlab-org/gitlab-ce!17007 | ||||
| * | | | Make resetting column information overridable in EE | Sean McGivern | 2018-02-08 | 1 | -2/+7 |
| | | | | |||||
* | | | | Merge branch 'bump-gitlab-shell-version-to-6-0-3' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Bumps Gitlab Shell version to 6.0.3 See merge request gitlab-org/gitlab-ce!17008 | ||||
| * | | | Bumps Gitlab Shell version to 6.0.3bump-gitlab-shell-version-to-6-0-3 | Tiago Botelho | 2018-02-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'feature/26598-clear-button-ci-lint' into 'master' | Clement Ho | 2018-02-08 | 4 | -8/+39 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added 'clear' button to ci lint editor Closes #26598 and #41209 See merge request gitlab-org/gitlab-ce!16970 | ||||
| * | | | Added 'clear' button to ci lint editor | Lin Jen-Shin | 2018-02-08 | 4 | -8/+39 |
|/ / / | |||||
* | | | Merge branch 'docs-for-commits-linking-to-mrs' into 'master' | Sean McGivern | 2018-02-08 | 1 | -1/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | Add docs for MR link in commit page See merge request gitlab-org/gitlab-ce!16994 | ||||
| * | | | Add docs for MR link in commit pagedocs-for-commits-linking-to-mrs | Sean McGivern | 2018-02-08 | 1 | -1/+14 |
| | |/ | |/| | |||||
* | | | Merge branch '180-qa-fix-api-spec' into 'master' | Grzegorz Bizon | 2018-02-08 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve 10.5.0 RC1 QA Failure with failing API specs Closes gitlab-qa#180 See merge request gitlab-org/gitlab-ce!16999 | ||||
| * | | | don't check against a hardcoded user name180-qa-fix-api-spec | Brett Walker | 2018-02-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | and use an invalid user name that is random so we know it's invalid | ||||
* | | | | Merge branch 'issues-in-subgroups' into 'master' | Sean McGivern | 2018-02-08 | 2 | -6/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Issues and merge requests in subgroups docs See merge request gitlab-org/gitlab-ce!16978 | ||||
| * | | | | Issues and merge requests in subgroups docs | Victor Wu 🌴Vacation Feb 10-18🌴 | 2018-02-08 | 2 | -6/+4 |
|/ / / / | |||||
* | | | | Merge branch 'update-docs-labels-ce' into 'master' | Marcia Ramos | 2018-02-08 | 25 | -119/+70 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update docs labels CE See merge request gitlab-org/gitlab-ce!16974 | ||||
| * | | | | Update docs labels CE | Victor Wu 🌴Vacation Feb 10-18🌴 | 2018-02-08 | 25 | -119/+70 |
| | | | | | |||||
* | | | | | Merge branch '10-5-update-dependencies-license-list' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -9/+1259 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 10.5 Update the dependencies license list See merge request gitlab-org/gitlab-ce!16998 | ||||
| * | | | | | 10.5 Update the dependencies license list10-5-update-dependencies-license-list | Mark Fletcher | 2018-02-08 | 1 | -9/+1259 |
| | | | | | | |||||
* | | | | | | Merge branch 'new-list-dropdown-ajax-refactor' into 'master' | Filipa Lacerda | 2018-02-08 | 1 | -3/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced $.get with axois.get See merge request gitlab-org/gitlab-ce!16992 |