summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add SSO and CAPTCHA notes to JIRA docsdocs/add-jira-sso-captcha-notesCindy Pallares 🦉2018-02-121-0/+16
* Merge branch 'andr3-clean-eslint-disables-from-board-components' into 'master'Clement Ho2018-02-123-7/+6
|\
| * Clean new Flash() and stop disabling no-new (eslint) when possibleAndré Luís2018-02-123-7/+6
|/
* Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-122-5/+7
|\
| * Disable query limiting warnings for now on GitLab.comStan Hu2018-02-122-5/+7
* | Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-122-7/+11
|\ \
| * | Honour workhorse provided file nameac/4878-fix-attachments-extAlessio Caiazza2018-02-122-7/+11
* | | Merge branch 'jivl-fix-warning-messages-labels-milestones' into 'master'43024-links-in-issue-board-are-brokenClement Ho2018-02-123-3/+3
|\ \ \
| * | | Fix warning messages for promoting labels and milestonesJose Ivan Vargas2018-02-123-3/+3
* | | | Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading...Ian Baum2018-02-126-113/+17
|\ \ \ \
| * | | | Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-s...rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-126-113/+17
* | | | | Merge branch 'jivl-fix-missing-js-selector-realtime-pipeline' into 'master'Filipa Lacerda2018-02-122-2/+2
|\ \ \ \ \
| * | | | | Fixed missing js selector for the realtime pipelines commit compjivl-fix-missing-js-selector-realtime-pipelineJose Ivan Vargas2018-02-122-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'groups-select-axios' into 'master'Filipa Lacerda2018-02-121-11/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Convert groups_select ajax to use axiosgroups-select-axiosPhil Hughes2018-02-091-11/+11
* | | | | Merge branch '40994-fix-ee-ce-compatible-test' into 'master'Kamil Trzciński2018-02-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-testDylan Griffith2018-02-091-1/+1
* | | | | 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