summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'gt-limit-gitlab-assets-compile-job-to-branches' into 'master'Rémy Coutable2018-11-221-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit `gitlab:assets:compile` job to branches and tags Closes #54361 See merge request gitlab-org/gitlab-ce!23302
| * | | | | | | | | | | Limit `gitlab:assets:compile` job to branchesGeorge Tsiolis2018-11-221-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-typos-occured' into 'master'Kushal Pandya2018-11-2214-55/+55
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos occured to occurred See merge request gitlab-org/gitlab-ce!23105
| * | | | | | | | | | | Update gitlab.potHiroyuki Sato2018-11-211-32/+32
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fix-typos-occuredHiroyuki Sato2018-11-211161-8147/+7900
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
| * | | | | | | | | | | | Fix typos occured to occurredHiroyuki Sato2018-11-1614-25/+25
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-11-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-complete' into 'master' Resolve "`fetch-assets` job times out so `package-and-qa` jobs can't complete" Closes #54293 See merge request gitlab-org/gitlab-ce!23267
| * | | | | | | | | | | | Pass GITLAB_REF_SLUG to the Omnibus triggers54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-completeRémy Coutable2018-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'docs/fix-shibboleth-markdown' into 'master'Achilleas Pipinellis2018-11-221-85/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown to render correctly See merge request gitlab-org/gitlab-ce!23221
| * | | | | | | | | | | | | Fix markdown to render correctlydocs/fix-shibboleth-markdownEvan Read2018-11-201-85/+85
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs/delete-broken-link' into 'master'Achilleas Pipinellis2018-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove broken link that 404s and has no alternative See merge request gitlab-org/gitlab-ce!23295
| * | | | | | | | | | | | | Remove broken link that 404s and has no alternativedocs/delete-broken-linkEvan Read2018-11-221-1/+1
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Douwe Maan2018-11-222-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-version' into 'master' SystemCheck: Use a more reliable way to detect current Ruby version Closes #46950 See merge request gitlab-org/gitlab-ce!23291
| * | | | | | | | | | | | | Use a more reliable way to detect current Ruby version46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-version46950-systemcheck-ruby-versionGabriel Mazetto2018-11-212-1/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'revert-fd6e3781' into 'master'Sean McGivern2018-11-2219-1281/+785
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-e2aa2177' into 'master'" Closes #54267 See merge request gitlab-org/gitlab-ce!23237
| * | | | | | | | | | | | | | Fix bug where ID is not setrevert-fd6e3781Zeger-Jan van de Weg2018-11-203-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On HEAD~ we remove the ID from the class, which created a bug. Given we don't need the ID anymore, it has been removed and simplified.
| * | | | | | | | | | | | | | Revert "Merge branch 'revert-e2aa2177' into 'master'"Zeger-Jan van de Weg2018-11-2018-1275/+756
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !23229
* | | | | | | | | | | | | | | Merge branch '47986-rubocop-safe-params' into 'master'Rémy Coutable2018-11-223-0/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cop prohibiting params argument in url_for Closes #47986 See merge request gitlab-org/gitlab-ce!23115
| * | | | | | | | | | | | | | Add cop prohibiting params argument in url_for47986-rubocop-safe-paramsJarka Košanová2018-11-223-0/+74
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'patch-32' into 'master'Grzegorz Bizon2018-11-224-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in scheduled pipelines See merge request gitlab-org/gitlab-ce!23218
| * | | | | | | | | | | | | | Fix typo in scheduled pipelinesDavy Defaud2018-11-224-3/+8
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'patch-32' into 'master'Achilleas Pipinellis2018-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update discord_notifications.md See merge request gitlab-org/gitlab-ce!23292
| * | | | | | | | | | | | | | Update discord_notifications.mdblackst0ne2018-11-211-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'docs-move-issue-fix' into 'master'Evan Read2018-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix API move issue curl command See merge request gitlab-org/gitlab-ce!23290
| * | | | | | | | | | | | | | | Docs: fix API move issue curl commandCynthia Ng2018-11-221-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '53596-mention-required-file-extension-yaml-include-docs' into ↵Evan Read2018-11-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update docs for include to mention required file extension Closes #53596 See merge request gitlab-org/gitlab-ce!23048
| * | | | | | | | | | | | | | Update doc/ci/yaml/README.mdDaniel Fernau2018-11-141-0/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '54201-update-rack-to-2.0.6' into 'master'Douglas Barbosa Alexandre2018-11-213-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rack to 2.0.6 Closes #54201 See merge request gitlab-org/gitlab-ce!23171
| * | | | | | | | | | | | | | | Update rack to 2.0.6 (for QA environments) for addressing CVE-2018-16471Takuya Noguchi2018-11-223-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | | | Merge branch 'docs-fix-links-3' into 'master'Evan Read2018-11-214-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Cleaning up various links See merge request gitlab-org/gitlab-ce!23110
| * | | | | | | | | | | | | | | | Docs: Cleaning up various linksMarcel Amirault2018-11-214-9/+7
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'gt-use-gl-tooltip-directive' into 'master'Clement Ho2018-11-219-54/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `gl-tooltip` directive in badges, cycle analytics, and diffs See merge request gitlab-org/gitlab-ce!22770
| * | | | | | | | | | | | | | | Update `gitlab` npm namespaceGeorge Tsiolis2018-11-213-6/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add `hover` on button tooltipsGeorge Tsiolis2018-11-213-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ui/issues/89
| * | | | | | | | | | | | | | | Remove the tooltip trigger suffixGeorge Tsiolis2018-11-211-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Restore tooltip placement propGeorge Tsiolis2018-11-211-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove redundant specs for tooltipGeorge Tsiolis2018-11-213-33/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Replace tooltip directive with gl-tooltip directive in badges, cycle ↵George Tsiolis2018-11-217-27/+24
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | analytics, and diffs
* | | | | | | | | | | | | | | Merge branch 'fj-47494-upgrade-git-to-2-18-0' into 'master'Nick Thomas2018-11-213-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgraded minimum Git version to 2.18.0 Closes #47494 See merge request gitlab-org/gitlab-ce!22803
| * | | | | | | | | | | | | | Upgraded minimum Git version to 2.18.0Francisco Javier López2018-11-213-2/+7
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '54230-eliminate-duplicated-words-in-apps' into 'master'Rémy Coutable2018-11-2142-49/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate duplicated words (in apps) Closes #54230 See merge request gitlab-org/gitlab-ce!23184
| * | | | | | | | | | | | | | Eliminate duplicated wordsTakuya Noguchi2018-11-2242-49/+49
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | Merge branch 'reinstate-d5a24021a4e583' into 'master'Yorick Peterse2018-11-214-6/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reinstate changes from MR 23234 See merge request gitlab-org/gitlab-ce!23282
| * | | | | | | | | | | | | | Reinstate changes from MR 23234reinstate-d5a24021a4e583Yorick Peterse2018-11-214-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reinstates the changes added in MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23234. I was testing a script that was supposed to operate on a fork of CE (yorickpeterse/gitlab-ce), but it was operating on gitlab-org/gitlab-ce by accident.
* | | | | | | | | | | | | | | Merge branch 'issue_53908' into 'master'Marcia Ramos2018-11-212-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for notes filters Closes #53908 See merge request gitlab-org/gitlab-ce!23196
| * | | | | | | | | | | | | | | Add documentation for notes filtersissue_53908Felipe Artur2018-11-212-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes/Discussions filters documentation was missingg.
* | | | | | | | | | | | | | | | Merge branch 'sh-fix-issue-51220' into 'master'Rémy Coutable2018-11-213-8/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle force_remove_source_branch when creating merge request Closes #51220 See merge request gitlab-org/gitlab-ce!23281
| * | | | | | | | | | | | | | | | Handle force_remove_source_branch when creating merge requestsh-fix-issue-51220Stan Hu2018-11-213-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a merge request with `merge_request[force_remove_source_branch]` parameter would result in an Error 500 since this attribute was passed directly to the merge request. Fix this by properly parsing this attribute into `merge_params`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51220
* | | | | | | | | | | | | | | | | Merge branch 'deprecate-ux' into 'master'Marcia Ramos2018-11-2116-1464/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecate UX Guide and redirect to design.gitlab Closes #54089 See merge request gitlab-org/gitlab-ce!22796
| * | | | | | | | | | | | | | | | deprecate UX Guide and redirect to design.gitlabSarrah Vesselov2018-11-2116-1464/+43
|/ / / / / / / / / / / / / / / /