summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Move IssuableTimeTracker vue componentGeorge Tsiolis2018-02-124-75/+85
| | | | | | | | | |
* | | | | | | | | | Merge branch '42928-default-protected-variables-to-off' into 'master'Filipa Lacerda2018-02-124-7/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default CI variables to unprotected Closes #42928 See merge request gitlab-org/gitlab-ce!17039
| * | | | | | | | | | Default CI variables to unprotected42928-default-protected-variables-to-offEric Eastwood2018-02-094-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/42928
* | | | | | | | | | | Merge branch 'npm-waitforimages' into 'master'Tim Zallmann2018-02-127-149/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update jquery.waitforimages & use npm version See merge request gitlab-org/gitlab-ce!17004
| * | | | | | | | | | | Update jquery.waitforimages & use npm versionnpm-waitforimagesPhil Hughes2018-02-087-149/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #39072
* | | | | | | | | | | | Merge branch 'sh-add-login-types-qa' into 'master'Grzegorz Bizon2018-02-125-1/+50
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP) See merge request gitlab-org/gitlab-ce!17048
| * | | | | | | | | | | | GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. ↵sh-add-login-types-qaStan Hu2018-02-115-1/+50
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standard, LDAP) GITLAB_USERNAME and GITLAB_PASSWORD may be specified for an LDAP login, but QA scenarios may need to know which type it is in order to log in successfully.
* | | | | | | | | | | | Merge branch '42922-environment-name' into 'master'Phil Hughes2018-02-123-11/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add tooltip in enviroments names" Closes #42922 See merge request gitlab-org/gitlab-ce!17029
| * | | | | | | | | | | | Adds tooltip for environment name42922-environment-nameFilipa Lacerda2018-02-093-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds CSS for child envrionments
* | | | | | | | | | | | | Merge branch '42908-rename-scss-files-to-use-snake-case' into 'master'Filipa Lacerda2018-02-129-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename .scss files to use snake_case Closes #42908 See merge request gitlab-org/gitlab-ce!17022
| * | | | | | | | | | | | | Rename .scss files to use snake_case42908-rename-scss-files-to-use-snake-caseEric Eastwood2018-02-089-8/+8
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/42908
* | | | | | | | | | | | | Merge branch '42937-search-api-fix' into 'master'Grzegorz Bizon2018-02-122-4/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API - fix searching in group/project specified by path Closes #42937 See merge request gitlab-org/gitlab-ce!17033
| * | | | | | | | | | | | API - fix searching in group/project specified by path42937-search-api-fixJarka Kadlecová2018-02-092-4/+24
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix/encoding-to-unsupported-encodings' into 'master'Robert Speicher2018-02-092-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a warning string if we try to encode to unsupported encoding Closes gitlab-development-kit#321 See merge request gitlab-org/gitlab-ce!17038
| * | | | | | | | | | | | | Return a warning string if we try to encode to unsupported encodingAhmad Sherif2018-02-092-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-development-kit#321
* | | | | | | | | | | | | | Merge branch 'winh-remove-confirmation_input' into 'master'Clement Ho2018-02-092-125/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove confirmation_input component See merge request gitlab-org/gitlab-ce!17046
| * | | | | | | | | | | | | | Remove confirmation_inputWinnie Hellmann2018-02-092-125/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'rs-pick-security' into 'master'Stan Hu2018-02-0930-130/+651
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick 10.4.3 fixes into master See merge request gitlab-org/gitlab-ce!17040
| * | | | | | | | | | | | | Resolve failures in GitHub-ish import controller specsrs-pick-securityRobert Speicher2018-02-091-4/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove changelogs for already-released security patchesRobert Speicher2018-02-094-20/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-095-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix using wildcards in protected tags to expose protected variables
| * | | | | | | | | | | | | Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-02-096-29/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.4] Fix GH namespace security issue
| * | | | | | | | | | | | | Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into ↵Robert Speicher2018-02-095-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 Maan2018-02-099-15/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.4] Fix stored XSS in code blocks
| * | | | | | | | | | | | | Merge branch ↵Douwe Maan2018-02-099-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 Hughes2018-02-091-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-blockFilipa Lacerda2018-02-091-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Improve docs about allowing some side effects on the constructorFilipa Lacerda2018-02-091-2/+31
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sh-add-docker-build-qa' into 'master'Grzegorz Bizon2018-02-091-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-qaStan Hu2018-02-091-0/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'qa/gb/do-not-require-test-network-in-pipeline-tests' into 'master'Robert Speicher2018-02-092-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-testsGrzegorz Bizon2018-02-092-2/+12
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'qa-allow-setting-sandbox-group' into 'master'Grzegorz Bizon2018-02-094-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-Shin2018-02-09107-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::EnvLin Jen-Shin2018-02-093-3/+15
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Allow using a different sandbox group for QALin Jen-Shin2018-02-082-1/+9
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fl-mr-widget-missing-branch' into 'master'Phil Hughes2018-02-094-69/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves missing branch into a vue file See merge request gitlab-org/gitlab-ce!17016
| * | | | | | | | | | | | | | Remove not needed default statementFilipa Lacerda2018-02-091-1/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Moves missing branch into a vue filefl-mr-widget-missing-branchFilipa Lacerda2018-02-084-69/+73
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'axios-post-importer' into 'master'Filipa Lacerda2018-02-0913-176/+328
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace $.post in importer status with axios See merge request gitlab-org/gitlab-ce!16692
| * | | | | | | | | | | | | Replace $.post in importer status with axiosClement Ho2018-02-0913-176/+328
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs/update-vue-naming-guidelines' into 'master'Phil Hughes2018-02-092-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vue component naming guidelines See merge request gitlab-org/gitlab-ce!17018
| * | | | | | | | | | | | Update vue component naming guidelinesGeorge Tsiolis2018-02-082-5/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sh-ldap-set-first-password-qa' into 'master'Grzegorz Bizon2018-02-091-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-qaStan Hu2018-02-081-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 Hu2018-02-091-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 CENick Thomas2018-02-081-39/+52
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix/remove-n-plus-one-from-branches-filter' into 'master'Robert Speicher2018-02-081-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_filterAhmad Sherif2018-02-081-11/+8
|/ / / / / / / / /
* | | | | | | | | Merge branch '40744-hashed-storage-specs' into 'master'Sean McGivern2018-02-0836-254/+349
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use hashed storage in the specs Closes #40744 See merge request gitlab-org/gitlab-ce!15681