summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2018-11-21385-6103/+2025
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade prettier to v1.15.2 See merge request gitlab-org/gitlab-ce!22893
| * | | | | | | | | | | | | | | | | | Upgrade gitlab eslint config to latestmg-upgrade-prettierMike Greiling2018-11-203-10/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix broken karma specsMike Greiling2018-11-205-6/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Disable conflicting eslint rulesMike Greiling2018-11-201-2/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Prettify all the thingsMike Greiling2018-11-20377-6085/+2002
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Upgrade prettier to 1.15.2Mike Greiling2018-11-202-5/+5
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'docs/pages-access-control' into 'master'Evan Read2018-11-215-11/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user docs for Pages access control Closes #54143 See merge request gitlab-org/gitlab-ce!23145
| * | | | | | | | | | | | | | | | | | Add user docs for Pages access controlAchilleas Pipinellis2018-11-215-11/+58
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch ↵Evan Read2018-11-201-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53571-Add-the-fact-that-Web-IDE-does-syntax-highlighting-for-all-languages-supported-by-Monaco' into 'master' Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571 Closes #53571 See merge request gitlab-org/gitlab-ce!23117
| * | | | | | | | | | | | | | | | | | Added information about syntax highlighting in Web IDE. Fixes ↵Marc Schwede2018-11-201-0/+21
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-org/gitlab-ce#53571
* | | | | | | | | | | | | | | | | | Merge branch 'gt-align-issue-status-and-confidential-icon' into 'master'Fatih Acet2018-11-204-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align issue status label and confidential icon Closes #53943 See merge request gitlab-org/gitlab-ce!23046
| * | | | | | | | | | | | | | | | | | Align issue status label and confidential iconGeorge Tsiolis2018-11-204-7/+9
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'gt-externalize-app-views-repository_check_mailer' into 'master'Fatih Acet2018-11-203-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/repository_check_mailer` See merge request gitlab-org/gitlab-ce!23211
| * | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/repository_check_mailer`George Tsiolis2018-11-203-5/+13
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-escape-utils' into 'master'52276-jump-to-top-in-merge-request-2Douglas Barbosa Alexandre2018-11-202-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade escape_utils to 1.2.1 See merge request gitlab-org/gitlab-ce!23248
| * | | | | | | | | | | | | | | | | | Upgrade escape_utils to 1.2.1sh-bump-escape-utilsStan Hu2018-11-202-2/+2
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the version shipped in gitaly-ruby. The main changes between 1.1.1 and 1.2.1 are CI-related improvements: https://github.com/brianmario/escape_utils/compare/1.1.1...1.2.1
* | | | | | | | | | | | | | | | | | Merge branch 'gt-remove-instances-of-extend-monospace' into 'master'Phil Hughes2018-11-2015-33/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove instances of `@extend .monospace` See merge request gitlab-org/gitlab-ce!23089
| * | | | | | | | | | | | | | | | | | Remove instances of `@extend .monospace`George Tsiolis2018-11-2015-33/+18
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'gt-externalize-app-views-peek' into 'master'Fatih Acet2018-11-202-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/peek` See merge request gitlab-org/gitlab-ce!23207
| * | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/peek`George Tsiolis2018-11-192-2/+8
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '54032-restrict-reply-shortcut-text' into 'master'Phil Hughes2018-11-204-9/+195
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "The reply shortcut can add any text of the page to the "comment" text area" Closes #54032 See merge request gitlab-org/gitlab-ce!23096
| * | | | | | | | | | | | | | | | | Resolve "The reply shortcut can add any text of the page to the "comment" ↵Thomas Pathier2018-11-204-9/+195
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text area"
* | | | | | | | | | | | | | | | | Merge branch 'ide-open-all-mr-files' into 'master'Filipa Lacerda2018-11-204-6/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open first 10 merge request files in IDE Closes #51635 See merge request gitlab-org/gitlab-ce!23234
| * | | | | | | | | | | | | | | | Added a test for open merge request filesPhil Hughes2018-11-202-4/+28
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Open first 10 merge request files in IDEPhil Hughes2018-11-204-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
* | | | | | | | | | | | | | | | | Merge branch 'docs-fix-user-metrics' into 'master'Achilleas Pipinellis2018-11-208-27/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix user metrics doc See merge request gitlab-org/gitlab-ce!23233
| * | | | | | | | | | | | | | | | | Docs: fix user metrics docMarcia Ramos2018-11-208-27/+42
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '54166-docs-feedback-update-gitaly-docs' into 'master'Achilleas Pipinellis2018-11-201-14/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Docs feedback: Update gitaly docs" Closes #54166 See merge request gitlab-org/gitlab-ce!23191
| * | | | | | | | | | | | | | | | | Resolve "Docs feedback: Update gitaly docs"Zeger-Jan van de Weg2018-11-201-14/+6
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-11-2035-73/+813
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSH public-key authentication for push mirroring Closes #49565 See merge request gitlab-org/gitlab-ce!22982
| * | | | | | | | | | | | | | | | SSH public-key authentication for push mirroringNick Thomas2018-11-1935-73/+813
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'frozen-string-lib-gitlab-even-even-even-more' into 'master'Rémy Coutable2018-11-20102-9/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable even more frozen string for lib/gitlab See merge request gitlab-org/gitlab-ce!23225
| * | | | | | | | | | | | | | | | | Enable even more frozen string for lib/gitlabgfyoung2018-11-19102-9/+217
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/patch/**/*.rb * lib/gitlab/popen/**/*.rb * lib/gitlab/profiler/**/*.rb * lib/gitlab/project_authorizations/**/*.rb * lib/gitlab/prometheus/**/*.rb * lib/gitlab/query_limiting/**/*.rb * lib/gitlab/quick_actions/**/*.rb * lib/gitlab/redis/**/*.rb * lib/gitlab/request_profiler/**/*.rb * lib/gitlab/search/**/*.rb * lib/gitlab/sherlock/**/*.rb * lib/gitlab/sidekiq_middleware/**/*.rb * lib/gitlab/slash_commands/**/*.rb * lib/gitlab/sql/**/*.rb * lib/gitlab/template/**/*.rb * lib/gitlab/testing/**/*.rb * lib/gitlab/utils/**/*.rb * lib/gitlab/webpack/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | | | | | | | | | | | | | | | | Merge branch 'patch-30' into 'master'Marcia Ramos2018-11-201-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 11.3-to-11.4.md See merge request gitlab-org/gitlab-ce!23142
| * | | | | | | | | | | | | | | | | Update 11.3-to-11.4.mdMateusz2018-11-161-4/+4
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Marcia Ramos2018-11-201-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 11.2-to-11.3.md See merge request gitlab-org/gitlab-ce!23141
| * | | | | | | | | | | | | | | | | Update 11.2-to-11.3.mdMateusz2018-11-161-4/+4
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'gt-externalize-app-views-projects-diffs' into 'master'Phil Hughes2018-11-2015-22/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/projects/diffs` See merge request gitlab-org/gitlab-ce!23230
| * | | | | | | | | | | | | | | | | Externalize strings from `/app/views/projects/diffs`George Tsiolis2018-11-2015-22/+53
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'improve_migrations_docs' into 'master'Yorick Peterse2018-11-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Correct inaccurate phrase related to disable_ddl_transaction mode See merge request gitlab-org/gitlab-ce!21175
| * | | | | | | | | | | | | | | | | | Correct inaccurate phrase related to disable_ddl_transaction modeimprove_migrations_docsNikolay2018-08-141-3/+3
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'docs/post-merge-pipelines' into 'master'Marcia Ramos2018-11-202-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on post-merge pipelines Closes #53527 See merge request gitlab-org/gitlab-ce!23054
| * | | | | | | | | | | | | | | | | | | Add docs on post-merge pipelinesdocs/post-merge-pipelinesAchilleas Pipinellis2018-11-202-2/+30
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs/direct-link-review-apps' into 'master'Marcia Ramos2018-11-203-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for linking in changed pages from MR widget Closes #53420 See merge request gitlab-org/gitlab-ce!22990
| * | | | | | | | | | | | | | | | | | | | Add docs for linking in changed pages from MR widgetdocs/direct-link-review-appsAchilleas Pipinellis2018-11-163-8/+26
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'revert-e2aa2177' into 'master'Sean McGivern2018-11-2018-756/+1275
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" See merge request gitlab-org/gitlab-ce!23229
| * | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"revert-e2aa2177Sean McGivern2018-11-2018-756/+1275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !23140
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'project_identicon_fix' into 'master'Kushal Pandya2018-11-202-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a project icon in home panel view, #51157. Closes #51157 See merge request gitlab-org/gitlab-ce!23166
| * | | | | | | | | | | | | | | | | | | | | Add changelog item for changes.Harry Kiselev2018-11-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is last commit that closes #51157 issue.
| * | | | | | | | | | | | | | | | | | | | | Fix a project icon in home panel view, #51157.Harry Kiselev2018-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | |