summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Redirect Kubernetes installation to the charts docsdocs/point-to-new-chart-linksAchilleas Pipinellis2019-03-1912-931/+46
| | | | | With the advent of the new chart docs, we should deprecate the old ones and redirect them to the new ones.
* Merge branch 'fix-pipeline-entity' into 'master'Kamil Trzciński2019-03-137-11/+51
|\ | | | | | | | | Add merge request pipeline flag to pipeline entity See merge request gitlab-org/gitlab-ce!25846
| * Add attached flag to pipeline entityShinya Maeda2019-03-137-11/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec Fix Fix Add changelog Drop attached Remove attached Update changelog ok
* | Merge branch 'qa-project-from-instance-project-template-ce' into 'master'Dan Davison2019-03-133-4/+7
|\ \ | | | | | | | | | | | | CE port of "e2e test for creating a project from instance template" See merge request gitlab-org/gitlab-ce!25760
| * | Use prefer_exact match typeSanad Liaquat2019-03-071-1/+1
| | |
| * | Add qa class and some refactorSanad Liaquat2019-03-072-3/+6
| | |
* | | Merge branch '48324-enable-squash-message-on-fast-forward' into 'master'Phil Hughes2019-03-136-48/+205
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow modifying squash commit message for fast-forward only merge method Closes #48324, #58805, and #58631 See merge request gitlab-org/gitlab-ce!26017
| * | | Added changelog entryNatalia Tepluhina2019-03-136-48/+205
|/ / / | | | | | | | | | - fixed tests for edit components
* | | Merge branch 'winh-webpack-config' into 'master'Phil Hughes2019-03-131-13/+39
|\ \ \ | | | | | | | | | | | | | | | | Resolve differences in Webpack config between CE and EE See merge request gitlab-org/gitlab-ce!26100
| * | | Resolve differences in Webpack config between CE and EEWinnie Hellmann2019-03-131-13/+39
| | | |
* | | | Merge branch 'fix-review-app-env-url' into 'master'Douwe Maan2019-03-133-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use project name and ID in Review App environment URLs instead of the project path slug Closes #52990 See merge request gitlab-org/gitlab-ce!25990
| * | | | Use project name and id in review app url instead of project path slugwalkafwalka2019-03-123-4/+9
| | | | |
* | | | | Merge branch 'docs/fix-links' into 'master'Marcia Ramos2019-03-132-5/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix some 404ing links See merge request gitlab-org/gitlab-ce!25789
| * | | | | Fix some 404ing linksEvan Read2019-03-132-5/+8
|/ / / / /
* | | | | Merge branch 'pravi/gitlab-ce-update-recaptcha' into 'master'Rémy Coutable2019-03-134-5/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Update recaptcha gem from 3.x to 4.11 See merge request gitlab-org/gitlab-ce!25921
| * | | | Apply recaptcha API changes in 4.0Toon Claes2019-03-084-1161/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In recaptcha 4.0.0 there was an API change: - `public_key` -> `site_key` - `private_key` -> secret_key See: https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md
| * | | | Update recaptcha 3.0 -> 4.11Pirate Praveen2019-03-083-3/+1161
| | | | |
* | | | | Merge branch 'allow-filtering-labels-by-a-single-character' into 'master'Robert Speicher2019-03-134-1/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow filtering labels by a single character Closes #58795 See merge request gitlab-org/gitlab-ce!26012
| * | | | | Allow filtering labels by a single characterSean McGivern2019-03-134-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we use Gitlab::SQL::Pattern, this typically relates to a trigram index. As the 'tri' indicates, we need at least three characters to be able to use that index. Labels don't have a trigram index, because we never allow you to search for them globally: it's always in the context of a project or a group. In that context, it's just as fast to search for a single character (in general) because there is already a pretty specific index being used.
* | | | | | Merge branch 'docs-javascript-style' into 'master'Marcia Ramos2019-03-131-162/+150
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Bring Javascript Style Guide in line with docs standards See merge request gitlab-org/gitlab-ce!25026
| * | | | | | Docs: Bring Javascript Style Guide in line with docs standardsMarcel Amirault2019-03-131-162/+150
|/ / / / / /
* | | | | | Merge branch '58876-mg-remove-jquery-atwho-gem' into 'master'Clement Ho2019-03-1311-1649/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jquery-atwho-rails gem" Closes #58876 See merge request gitlab-org/gitlab-ce!26058
| * | | | | | Prefer node_modules At.js and jquery.carat versionsMike Greiling2019-03-1311-1649/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Remove references to the vendored copies of At.js and jquery.carat as well as the legacy rails wrapper gem.
* | | | | | Merge branch 'use-only-all-pipelines' into 'master'Kamil Trzciński2019-03-138-43/+256
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor all_pipelines in Merge request in order to support all pipelines for merge request See merge request gitlab-org/gitlab-ce!25676
| * | | | | | Make all_pipelines method compatible with pipelines for merge requestsShinya Maeda2019-03-138-43/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it sane Include merge ref head Fix union Improve a bit Add spec remove add spec Add changelog fix coding offence Apply suggestion to spec/models/merge_request_spec.rb ok ok Fix Fix spec Fix spec fix Simplify the things Memoize OK a
* | | | | | | Merge branch 'sh-fix-blank-codeowners-ce' into 'master'Rémy Coutable2019-03-133-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error caused by CODEOWNERS with no matches Closes gitlab-ee#10282 See merge request gitlab-org/gitlab-ce!26072
| * | | | | | | Return early if there were no references in textBob Van Landuyt2019-03-131-5/+2
| | | | | | | |
| * | | | | | | Fix 500 error caused by CODEOWNERS with no matchesStan Hu2019-03-123-1/+18
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including a CODEOWNERS file with lines without any matching username or e-mail regular expressions would cause an Error 500. Don't attempt a database query if there is nothing to query. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10282
* | | | | | | Merge branch 'tz-load-emojis-from-server-not-cdn' into 'master'Filipa Lacerda2019-03-131-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the CDN loading for emojis.json See merge request gitlab-org/gitlab-ce!26102
| * | | | | | | Removes the CDN loading for emojis.jsonTim Zallmann2019-03-131-4/+1
|/ / / / / / /
* | | | | | | Merge branch 'modify_group_policy' into 'master'Rémy Coutable2019-03-133-5/+12
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Update group policy to reflect all the requirements See merge request gitlab-org/gitlab-ce!25854
| * | | | | | Update group policy to reflect all the requirementsMałgorzata Ksionek2019-03-133-5/+12
|/ / / / / /
* | | | | | Merge branch 'qa-staging-45-fix-add-project-member-spec' into 'master'Mark Lapierre2019-03-131-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore user status emoji in assertion Closes gitlab-org/quality/staging#45 See merge request gitlab-org/gitlab-ce!26085
| * | | | | | Makes the assertion for user given access emoji tolerantSanad Liaquat2019-03-131-3/+2
| | | | | | |
* | | | | | | Merge branch 'ce-9641-jira-connect-integration' into 'master'Sean McGivern2019-03-131-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter Jira shared secret from logs See merge request gitlab-org/gitlab-ce!26077
| * | | | | | | Filter Jira shared secret from logsHeinrich Lee Yu2019-03-131-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'docs/fix-group-transfer-docs' into 'master'Sean McGivern2019-03-131-9/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve precision of group docs Closes #58635 See merge request gitlab-org/gitlab-ce!25950
| * | | | | | | Improve precision of group docsEvan Read2019-03-131-9/+10
|/ / / / / / /
* | | | | | | Merge branch 'docs/minimise-danger-bot-message-for-docs' into 'master'Achilleas Pipinellis2019-03-131-19/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce dangerbot message to the essentials Closes #58231 See merge request gitlab-org/gitlab-ce!25585
| * | | | | | | Reduce dangerbot message to the essentialsEvan Read2019-03-131-19/+5
|/ / / / / / /
* | | | | | | Merge branch 'fix-activity-only-notice' into 'master'Filipa Lacerda2019-03-131-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Remove icon in activity only message on smaller screen widths See merge request gitlab-org/gitlab-ce!26032
| * | | | | | Remove icon in activity only message on smaller screen widthsAnnabel Dunstone Gray2019-03-121-1/+1
| | | | | | |
* | | | | | | Merge branch '10079-env-app' into 'master'Phil Hughes2019-03-133-4/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for environments_app Closes gitlab-ee#10079 See merge request gitlab-org/gitlab-ce!26030
| * | | | | | | Removes EE differences for env appFilipa Lacerda2019-03-123-4/+47
| | | | | | | |
* | | | | | | | Merge branch 'update-spacers' into 'master'Phil Hughes2019-03-131-1/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update spacers to increment 1 unit at a time See merge request gitlab-org/gitlab-ce!26033
| * | | | | | | Update spacers to increment 1 unit at a timeAnnabel Dunstone Gray2019-03-121-1/+4
| | | | | | | |
* | | | | | | | Merge branch 'qa-dd-autodevops-cleanup' into 'master'Dan Davison2019-03-131-69/+16
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Refactor AutoDevOps test to one test with two expectations See merge request gitlab-org/gitlab-ce!25836
| * | | | | | | Refactor test to one test with two expectationsddavison2019-03-111-69/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was previously split into two specs Having one spec with shared functionality seems more efficient Add job checks before the second push is made Revert "Add job checks before the second push is made" This reverts commit 64be444cd9d00f2f36eef6dd8a57b464bddbc4ef.
* | | | | | | | Merge branch 'docs/make-ce-like-ee-for-ci' into 'master'Mike Lewis2019-03-121-18/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add table entries from EE docs See merge request gitlab-org/gitlab-ce!25995
| * | | | | | | | Add table entries from EE docsEvan Read2019-03-121-18/+22
|/ / / / / / / /