summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Made the required changes.mdpatch-32-testing-rebaseArihant2018-12-121-1/+4
|
* Added example for get file archiveArihant2018-12-121-1/+2
|
* Merge branch 'feature/gb/ci-pipeline-bridge' into 'master'Kamil Trzciński2018-12-125-0/+118
|\ | | | | | | | | Add basic implementation of CI/CD bridge job See merge request gitlab-org/gitlab-ce!23730
| * Simplify CI/CD bridge classGrzegorz Bizon2018-12-121-8/+1
| |
| * Add basic implementation of CI/CD bridge jobGrzegorz Bizon2018-12-125-0/+125
| |
* | Merge branch 'qa-mr-wait-for-push' into 'master'Nick Thomas2018-12-121-1/+4
|\ \ | | | | | | | | | | | | Wait for push before trying to create a new MR See merge request gitlab-org/gitlab-ce!23745
| * | Wait for push before trying to create a new MRMark Lapierre2018-12-111-1/+4
| | |
* | | Merge branch 'zj-fix-pool-creation' into 'master'Nick Thomas2018-12-122-3/+26
|\ \ \ | | | | | | | | | | | | | | | | Fix creation query for pools repository See merge request gitlab-org/gitlab-ce!23729
| * | | Fix creation query for pools repositoryZeger-Jan van de Weg2018-12-122-3/+26
|/ / /
* | | Merge branch ↵Nick Thomas2018-12-1217-21/+240
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54650-send-an-email-to-project-owners-when-a-mirror-update-fails' into 'master' Send a notification email on mirror update errors Closes #54650 See merge request gitlab-org/gitlab-ce!23595
| * | | Send a notification email on mirror update errorsAlejandro Rodríguez2018-12-1117-21/+240
| | | | | | | | | | | | | | | | | | | | | | | | The email is sent to project maintainers containing the last mirror update error. This will allow maintainers to set alarms and react accordingly.
* | | | Merge branch 'docs/update-automatic-merge-documentation' into 'master'Marcia Ramos2018-12-121-83/+177
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update automatic merging documentation See merge request gitlab-org/gitlab-ce!23689
| * | | | Update automatic merging documentationYorick Peterse2018-12-111-83/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're moving from merging + reverting to only merging with the `ours` strategy, removing the need for merge requests or reverting conflicts. For more details, refer to Merge Train merge request https://gitlab.com/gitlab-org/merge-train/merge_requests/6.
* | | | | Merge branch 'lock-sass-3.5' into 'master'Stan Hu2018-12-123-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Specify sass ~> 3.5 in Gemfile See merge request gitlab-org/gitlab-ce!23716
| * | | | | Specify sass ~> 3.5 in GemfilePirate Praveen2018-12-123-0/+3
| | | | | |
* | | | | | Merge branch 'patch-35' into 'master'Marcia Ramos2018-12-121-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add spaces before code snippets in vuex.md See merge request gitlab-org/gitlab-ce!23737
| * | | | | | Add spaces before code snippetsSylhare2018-12-111-1/+5
| | | | | | |
* | | | | | | Merge branch 'issue_55133' into 'master'Sean McGivern2018-12-122-2/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issuables sort direction button parameters Closes #55133 See merge request gitlab-org/gitlab-ce!23744
| * | | | | | Fix issuables sort direction button parametersFelipe Artur2018-12-112-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels parameter being deleted from filter when clicking sort direction button on issues/merge requests search bar.
* | | | | | | Merge branch 'patch-35' into 'master'Achilleas Pipinellis2018-12-121-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Content corrections for reCAPTCHA docs See merge request gitlab-org/gitlab-ce!23667
| * | | | | | | Update recaptcha docs for clarityJames Anderson2018-12-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Specified that reCAPTCHA v2 keys must be used * Updated the URL for application settings * Some small rewording
* | | | | | | | Merge branch 'docs-add-fork-mr-clarification' into 'master'Achilleas Pipinellis2018-12-121-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add information about how merge requests related to forks are processed See merge request gitlab-org/gitlab-ce!23764
| * | | | | | | | add information about how merge requests related to forks are processedAlexander Tanayno2018-12-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | the added note describes code from https://gitlab.com/gitlab-org/gitlab-ee/blob/master/lib/gitlab/import_export/merge_request_parser.rb#L15
* | | | | | | | | Merge branch 'tatkins-installation-method-docs' into 'master'Achilleas Pipinellis2018-12-124-67/+93
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs to help choose the best GitLab installation method Closes #54308 See merge request gitlab-org/gitlab-ce!23254
| * | | | | | | | | 'of installing' -> 'for installing'Mike Lewis2018-12-071-1/+1
| | | | | | | | | |
| * | | | | | | | | Clarify the installation methodsAchilleas Pipinellis2018-12-061-34/+40
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Achilleas Pipinellis2018-12-05482-3276/+10044
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tatkins-installation-method-docs
| * | | | | | | | | | Make k8s trade-offs less intimidatingAchilleas Pipinellis2018-12-041-5/+3
| | | | | | | | | | |
| * | | | | | | | | | Reword note about familiarity with k8sAchilleas Pipinellis2018-12-034-48/+39
| | | | | | | | | | |
| * | | | | | | | | | Remove mention of deprecated charts in the docsAchilleas Pipinellis2018-12-031-23/+0
| | | | | | | | | | |
| * | | | | | | | | | Refactor the GitLab k8s installation methodAchilleas Pipinellis2018-11-293-60/+68
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into tatkins-installation-method-docsAchilleas Pipinellis2018-11-292541-24140/+117376
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix typo and broken link refstatkins-installation-method-docsTom Atkins2018-11-213-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Moderate warning caveats.Tom Atkins2018-11-211-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Couple of small edits/typosMike Lewis2018-11-201-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Update doc/install/README.md, doc/install/kubernetes/index.md, ↵Tom Atkins2018-11-203-11/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/install/kubernetes/gitlab_chart.md files
* | | | | | | | | | | | Merge branch 'docs/ci-yaml-table-links' into 'master'Achilleas Pipinellis2018-12-121-21/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hyperlinks to ci yaml documentation See merge request gitlab-org/gitlab-ce!23674
| * | | | | | | | | | | | Add hyperlinks to each section in the table of config optionsAsocPro2018-12-081-21/+21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-35' into 'master'Achilleas Pipinellis2018-12-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md See merge request gitlab-org/gitlab-ce!23672
| * | | | | | | | | | | | | Update README.mdScott Edlund2018-12-081-0/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs-update-rack-attack' into 'master'Achilleas Pipinellis2018-12-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove incorrect example Rack Attack configuration Closes #54983 See merge request gitlab-org/gitlab-ce!23742
| * | | | | | | | | | | | Update doc/security/rack-attack.mdMatt Rice2018-12-111-2/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-rubocop-issues' into 'master'Rémy Coutable2018-12-123-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ConstantName rubocop offense See merge request gitlab-org/gitlab-ce!23677
| * | | | | | | | | | | | Fix ConstantName rubocop offenseSemyon Pupkov2018-12-093-11/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fixed-note-awards-js' into 'master'Filipa Lacerda2018-12-123-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed emoji awards not being added to notes Closes #55141 See merge request gitlab-org/gitlab-ce!23720
| * | | | | | | | | | | | | Fixed emoji awards not being added to notesPhil Hughes2018-12-113-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55141
* | | | | | | | | | | | | | Merge branch 'iamphill-master-patch-68477' into 'master'Filipa Lacerda2018-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the debounce of Issue Suggestions See merge request gitlab-org/gitlab-ce!23721
| * | | | | | | | | | | | | | Increase the debounce of Issue SuggestionsPhil Hughes2018-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This increases the debounce for issue suggestions requests to `1000ms`. This is to reduce the number of requests that we send.
* | | | | | | | | | | | | | | Merge branch 'winh-markdown-preview-lists' into 'master'Phil Hughes2018-12-124-7/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary div from MarkdownField to apply list styles correctly Closes #55190 See merge request gitlab-org/gitlab-ce!23733
| * | | | | | | | | | | | | | | Remove unnecessary div from MarkdownField to apply list styles correctlyWinnie Hellmann2018-12-124-7/+18
| | | | | | | | | | | | | | | |