Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'fix/encoding-to-unsupported-encodings' into 'master' | Robert Speicher | 2018-02-09 | 2 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Return a warning string if we try to encode to unsupported encoding | Ahmad Sherif | 2018-02-09 | 2 | -3/+8 | |
* | | | | | | | | | | | Merge branch 'winh-remove-confirmation_input' into 'master' | Clement Ho | 2018-02-09 | 2 | -125/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove confirmation_input | Winnie Hellmann | 2018-02-09 | 2 | -125/+0 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'rs-pick-security' into 'master' | Stan Hu | 2018-02-09 | 30 | -130/+651 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
| * | | | | | | | | | | Merge branch 'fix/gh-namespace-issue' into 'security-10-4' | James Lopez | 2018-02-09 | 6 | -29/+87 | |
| * | | | | | | | | | | Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'sec... | Robert Speicher | 2018-02-09 | 5 | -2/+19 | |
| * | | | | | | | | | | Merge branch 'fix-mermaid-xss' into 'security-10-4' | Douwe Maan | 2018-02-09 | 9 | -15/+130 | |
| * | | | | | | | | | | Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibil... | Douwe Maan | 2018-02-09 | 9 | -75/+410 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'doc-improve-side-effects-block' into 'master' | Phil Hughes | 2018-02-09 | 1 | -2/+31 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 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 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 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 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into qa-allow-setting-sandbox-... | Lin Jen-Shin | 2018-02-09 | 107 | -559/+2399 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 | 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 | 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 testsh-ldap-set-first-password-qa | Stan Hu | 2018-02-08 | 1 | -9/+16 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge branch '42896-hashed-storage-beta-docs' into 'master' | Stan Hu | 2018-02-09 | 1 | -39/+52 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | 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 | 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 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' i... | Nick Thomas | 2018-02-08 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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.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 | 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 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | don't check against a hardcoded user name180-qa-fix-api-spec | Brett Walker | 2018-02-08 | 1 | -2/+2 | |
* | | | | | | | | Merge branch 'issues-in-subgroups' into 'master' | Sean McGivern | 2018-02-08 | 2 | -6/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Issues and merge requests in subgroups docs | Victor Wu 🌴Vacation Feb 10-18🌴 | 2018-02-08 | 2 | -6/+4 | |
|/ / / / / / / |