summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed missing js selector for the realtime pipelines commit compjivl-fix-missing-js-selector-realtime-pipelineJose Ivan Vargas2018-02-122-2/+2
* Merge branch '4826-geo-wikisyncservice-attempts-to-sync-projects' into 'master'Nick Thomas2018-02-124-2/+76
|\
| * Create an empty wiki when there is no wiki in the gitlab export bundleValery Sizov2018-02-124-2/+76
|/
* Merge branch 'group-label-page-breadcrumb' into 'master'Phil Hughes2018-02-122-1/+5
|\
| * Revert and remove header_title line from labels issueOnuwa Nnachi Isaac2018-02-123-2/+6
| * Fix breadcrumb on labels page for groupsOnuwa Nnachi Isaac2018-02-092-2/+2
* | Merge branch 'diff-and-gpg-badges-ajax-refactor' into 'master'Phil Hughes2018-02-123-28/+46
|\ \
| * | Fixed bug with param configdiff-and-gpg-badges-ajax-refactorConstance Okoghenun2018-02-121-1/+1
| * | changed params passed to from a string to an objectConstance Okoghenun2018-02-121-2/+3
| * | Fixed typo, updated test, and removed commented codeConstance Okoghenun2018-02-083-4/+3
| * | Replaced use of $.get with axios.get and updated testsConstance Okoghenun2018-02-083-28/+46
* | | Merge branch 'bw-fix-autoload-issue' into 'master'Rémy Coutable2018-02-121-0/+1
|\ \ \
| * | | make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issueBrett Walker2018-02-091-0/+1
* | | | Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master'Filipa Lacerda2018-02-124-75/+85
|\ \ \ \
| * | | | 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 unprotected42928-default-protected-variables-to-offEric Eastwood2018-02-094-7/+7
* | | | | | Merge branch 'npm-waitforimages' into 'master'Tim Zallmann2018-02-127-149/+6
|\ \ \ \ \ \
| * | | | | | Update jquery.waitforimages & use npm versionnpm-waitforimagesPhil Hughes2018-02-087-149/+6
* | | | | | | 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