summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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-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
| | | | | | | | | |
* | | | | | | | | | Merge branch 'gt-change-breadcrumb-title-for-contribution-charts' into 'master'Kushal Pandya2018-11-204-3/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change breadcrumb title for contribution charts Closes #44567 See merge request gitlab-org/gitlab-ce!23071
| * | | | | | | | | | Change breadcrumb title for contribution chartsGeorge Tsiolis2018-11-144-3/+13
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'image-diff-size-fix' into 'master'Filipa Lacerda2018-11-204-35/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the dimensions of image diffs Closes #54236 See merge request gitlab-org/gitlab-ce!23195
| * | | | | | | | | | | Fixed the dimensions of image diffsPhil Hughes2018-11-204-35/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54236
* | | | | | | | | | | | Merge branch 'docs/minor-aws-fixes' into 'master'Achilleas Pipinellis2018-11-202-17/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to AWS documentation See merge request gitlab-org/gitlab-ce!23198
| * | | | | | | | | | | | Fixes to AWS documentationBrendan O'Leary 🐢2018-11-202-17/+22
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix/allow-saml2-for-2fa-bypass' into 'master'Douwe Maan2018-11-203-1/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses See merge request gitlab-org/gitlab-ce!22568
| * | | | | | | | | | | | saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses1151002018-10-253-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ce/#53102.
* | | | | | | | | | | | | Merge branch '40085-add-a-create_merge_request-quick-action' into 'master'Douwe Maan2018-11-2011-6/+182
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add a `/create_merge_request` quick action" Closes #40085 See merge request gitlab-org/gitlab-ce!22485
| * | | | | | | | | | | | | Creates /create_merge_request quickaction40085-add-a-create_merge_request-quick-actionJacopo2018-11-1411-6/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this quick action the user can create a new MR starting from the current issue using as `source_branch` the given `branch name` and as `target_branch` the project default branch. If the `branch name` is omitted a name is automatically created starting from the issue title.
* | | | | | | | | | | | | | Merge branch '3062-improve-project-cache' into 'master'Douwe Maan2018-11-205-16/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change project cache key to depend on ID instead of full path Closes #42191 See merge request gitlab-org/gitlab-ce!23135
| * | | | | | | | | | | | | | Add `wiki` extra namespace when repository is_wiki: true3062-improve-project-cacheGabriel Mazetto2018-11-162-2/+28
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change specs to accept new cache keys for projectsGabriel Mazetto2018-11-161-11/+11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change project pipeline status cache key to follow project conventionGabriel Mazetto2018-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old cache key was: `projects/#{id}/pipeline_status/#{sha}` New one is: `project:#{id}:pipeline_status:#{sha}` This allows to delete any project related key just by scanning for: `project:#{id}`.
| * | | | | | | | | | | | | | Change project cache key to depend on ID instead of full pathGabriel Mazetto2018-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, project cache used as part of the namespace the `full_path`, which included namespace and project slug. That meant that anytime a project was renamed or transfered to a different namespace, we would lose the existing cache. This is not necessary, nor desired. I've prefixed cache key with `project:` to make it easy to find in redis if necessary as well as make it possible to purge all project related cache. I've also switched the cache key type to go after the initial namespace and not before.
* | | | | | | | | | | | | | | Merge branch 'osw-mention-when-ff-revert-should-be-picked' into 'master'Robert Speicher2018-11-201-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve FF "pick after the 7th" docs See merge request gitlab-org/gitlab-ce!23185
| * | | | | | | | | | | | | | Improve FF "pick after the 7th" docsosw-mention-when-ff-revert-should-be-pickedOswaldo Ferreira2018-11-191-0/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'gt-externalize-app-views-projects-environments' into 'master'Kushal Pandya2018-11-2011-34/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/projects/environments` See merge request gitlab-org/gitlab-ce!23210
| * | | | | | | | | | | | | | | Externalize strings from `/app/views/projects/environments`George Tsiolis2018-11-1911-34/+70
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'gt-externalize-app-views-u2f' into 'master'Kushal Pandya2018-11-203-16/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/u2f` See merge request gitlab-org/gitlab-ce!23201