summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reuse getter42923-close-issueFilipa Lacerda2018-02-126-21/+42
* [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-1261-358/+918
|\
| * 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. standa...sh-add-login-types-qaStan Hu2018-02-115-1/+50
| * | Merge branch '42922-environment-name' into 'master'Phil Hughes2018-02-123-11/+29
| |\ \
| | * | Adds tooltip for environment name42922-environment-nameFilipa Lacerda2018-02-093-11/+29
| * | | Merge branch '42908-rename-scss-files-to-use-snake-case' into 'master'Filipa Lacerda2018-02-129-8/+8
| |\ \ \
| | * | | Rename .scss files to use snake_case42908-rename-scss-files-to-use-snake-caseEric Eastwood2018-02-089-8/+8
| * | | | Merge branch '42937-search-api-fix' into 'master'Grzegorz Bizon2018-02-122-4/+24
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 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 encodingAhmad Sherif2018-02-092-3/+8
| * | | | | Merge branch 'winh-remove-confirmation_input' into 'master'Clement Ho2018-02-092-125/+0
| |\ \ \ \ \
| | * | | | | Remove confirmation_inputWinnie Hellmann2018-02-092-125/+0
| | |/ / / /
| * | | | | Merge branch 'rs-pick-security' into 'master'Stan Hu2018-02-0930-130/+651
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| | * | | | Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-02-096-29/+87
| | * | | | Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'sec...Robert Speicher2018-02-095-2/+19
| | * | | | Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-02-099-15/+130
| | * | | | Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibil...Douwe Maan2018-02-099-75/+410
| |/ / / /
| * | | | Merge branch 'doc-improve-side-effects-block' into 'master'Phil Hughes2018-02-091-2/+31
| |\ \ \ \
| | * | | | 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 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 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
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into qa-allow-setting-sandbox-...Lin Jen-Shin2018-02-09107-559/+2399
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | 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
| |\ \ \ \ \ \
| | * | | | | | 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
* | | | | | | | Put back class names used in shared testFilipa Lacerda2018-02-121-0/+2
* | | | | | | | Makes close/reopen issue request to inside the vue appFilipa Lacerda2018-02-0913-40/+206
|/ / / / / / /
* | | | | | | Merge branch 'axios-post-importer' into 'master'Filipa Lacerda2018-02-0913-176/+328
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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 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 testsh-ldap-set-first-password-qaStan Hu2018-02-081-9/+16
* | | | | Merge branch '42896-hashed-storage-beta-docs' into 'master'Stan Hu2018-02-091-39/+52
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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_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 specs40744-hashed-storage-specsNick Thomas2018-02-0736-254/+349