summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Rearrange the tests and add another case whereLin Jen-Shin2018-03-261-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it would still render the sidebar whenever the wiki is empty.
| * | | | | | | | | | | | | | Avoid loading default sidebar if there's a customized oneLin Jen-Shin2018-03-261-2/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add test for sidebar and cleanup wiki testsLin Jen-Shin2018-03-231-3/+38
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added support for custom wiki sidebar using _sidebar.md in the wiki root. If ↵Joshua Sooter2018-03-233-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _sidebar.md exists it will be parsed and rendered otherwise the default sidebar file list will display deleted _sidebar_custom.html.haml and modified _sidebar.html.haml to check for sidebar_page and render it or the default wiki page list. Also removed white space. fix indent in show.html.haml restore newline at end of ile Add a newline at the end of changelogs/custom_wiki_sidebar.yml
* | | | | | | | | | | | | | | Merge branch 'gitaly-mandatory-20180716-jv' into 'master'Sean McGivern2018-07-172-73/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate merge base, merged branches, write ref Closes gitaly#748, gitaly#695, and gitaly#799 See merge request gitlab-org/gitlab-ce!20639
| * | | | | | | | | | | | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-172-73/+12
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-1716-36/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add emails delivery metrics Closes #49214 See merge request gitlab-org/gitlab-ce!20638
| * | | | | | | | | | | | | | Add changelog entry for emails delivery metricsfeature/gb/email-delivery-metricsGrzegorz Bizon2018-07-161-0/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update notification specs after renaming a classGrzegorz Bizon2018-07-161-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-163-2/+73
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Register all action mailer interceptors in a single placeGrzegorz Bizon2018-07-164-7/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-1611-31/+49
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '38095-change-api-docs-lookup-by-username' into 'master'Rémy Coutable2018-07-171-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Change API docs to reflect that lookup by username does not require admin access" Closes #38095 See merge request gitlab-org/gitlab-ce!20646
| * | | | | | | | | | | | | | | Update doc/api/users.mdDaniel Fernau2018-07-161-15/+15
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move "search by email or username" block to "for normal users" section
* | | | | | | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2018-07-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipelines.md to have correct curl commands See merge request gitlab-org/gitlab-ce!20653
| * | | | | | | | | | | | | | Update pipelines.md to have correct curl commandsAlex Holland2018-07-161-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix-project-api-archived' into 'master'Rémy Coutable2018-07-165-3/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix archived parameter for projects API Closes #32301 See merge request gitlab-org/gitlab-ce!20566
| * | | | | | | | | | | | | | | Fix archived parameter for projects APIMarko, Peter2018-07-165-3/+48
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '49291-fix-memory-graph-component-typo' into 'master'Filipa Lacerda2018-07-163-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in CSS transform property for Memory Graph component Closes #49291 See merge request gitlab-org/gitlab-ce!20650
| * | | | | | | | | | | | | | | Add changelog entryKushal Pandya2018-07-161-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix `transform` typoKushal Pandya2018-07-162-2/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '49061-submodule-helper-fix' into 'master'Sean McGivern2018-07-162-17/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "NoMethodError: undefined method `namespace' for nil:NilClass" Closes #49061 See merge request gitlab-org/gitlab-ce!20615
| * | | | | | | | | | | | | | SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fixMario de la Ossa2018-07-152-17/+12
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'frozen-string-enable-app-services' into 'master'Rémy Coutable2018-07-1648-13/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string in apps/services/*.rb See merge request gitlab-org/gitlab-ce!20401
| * | | | | | | | | | | | | | Enable frozen string in apps/uploaders/*.rbgfyoung2018-07-1648-13/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | | | | | | | | | | | | Merge branch 'update-issue-closing-pattern' into 'master'Rémy Coutable2018-07-163-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issue closing pattern Closes #49166 See merge request gitlab-org/gitlab-ce!20554
| * | | | | | | | | | | | | | | Add tests for non-comma-separated issue numbers in single line messageGeorge Tsiolis2018-07-111-0/+14
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update issue closing patternGeorge Tsiolis2018-07-112-1/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'update-git-to-2-18-0' into 'master'Stan Hu2018-07-162-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Git version to 2.18.0 See merge request gitlab-org/gitlab-ce!20489
| * | | | | | | | | | | | | | | | Update .gitlab-ci.ymlupdate-git-to-2-18-0James Lopez2018-07-131-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update Git version to 2.18.0James Lopez2018-07-091-3/+3
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'dz-fix-com-architecture-link' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid link to GitLab.com architecture.md See merge request gitlab-org/gitlab-ce!20645
| * | | | | | | | | | | | | | | | | Fix invalid link to GitLab.com architecture.mddz-fix-com-architecture-linkDmitriy Zaporozhets2018-07-161-1/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tweak-sql-buckets' into 'master'Yorick Peterse2018-07-162-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 10 ms bucket for SQL timings See merge request gitlab-org/gitlab-ce!20527
| * | | | | | | | | | | | | | | | | Add a 10 ms bucket for SQL timingstweak-sql-bucketsYorick Peterse2018-07-102-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to calculate quantiles of SQL timings more accurately, instead of a lot of timings being assigned to the 50 ms bucket.
* | | | | | | | | | | | | | | | | | Merge branch 'i18n-extract-app/views/import' into 'master'Rémy Coutable2018-07-1615-163/+381
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/import' See merge request gitlab-org/gitlab-ce!19732
| * | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/import'Tao Wang2018-07-1615-163/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | | | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 10.6-to-10.7.md See merge request gitlab-org/gitlab-ce!20610
| * | | | | | | | | | | | | | | | | | Update 10.6-to-10.7.mdMateusz2018-07-131-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'remove-repository-lookup' into 'master'Sean McGivern2018-07-164-270/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Repository#lookup and unreachable rugged code See merge request gitlab-org/gitlab-ce!20553
| * | | | | | | | | | | | | | | | | Remove Repository#lookup and unreachable rugged codeJacob Vosmaer (GitLab)2018-07-164-270/+11
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2018-07-1612-25/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master' Resolve "Project exports fail when uploads have been migrated to object storage" Closes #48745 See merge request gitlab-org/gitlab-ce!20484
| * | | | | | | | | | | | | | | | | refactor code based on feedbackJames Lopez2018-07-162-5/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | use fileuploader dynamic path method in uploads manager and add spec48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storageJames Lopez2018-07-134-10/+18
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fix typo in uploads managerJames Lopez2018-07-131-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | add small comment to download method in uploads managerJames Lopez2018-07-131-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | refactor uploads managerJames Lopez2018-07-131-7/+7
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | update saver spec to use the old uploads codeJames Lopez2018-07-121-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | refactor uploads manager to grab uploads in batchesJames Lopez2018-07-121-6/+16
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fix uploads restorer missing pathJames Lopez2018-07-121-0/+4
| | | | | | | | | | | | | | | | | |