summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-191-0/+5
|
* Merge branch ↵Grzegorz Bizon2018-03-161-0/+5
|\ | | | | | | | | | | | | | | | | '41902-add-api-option-to-overwrite-project-description-on-project-export' into 'master' Resolve "Extend API for exporting a project with option to overwrite project description" Closes #41902 and #34936 See merge request gitlab-org/gitlab-ce!17744
| * Adds the option to override project description on export via APITiago Botelho2018-03-161-0/+5
| | | | | | | | and fixes the project description not being imported
* | Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-161-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Create commit API and Web IDE obey LFS filters Closes #42287 See merge request gitlab-org/gitlab-ce!16718
| * | Multi-file upload and Commit API obey LFS filtersJames Edwards-Jones2018-03-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Updates Files::MultiService for the commits API which is in turn used by the multi-file upload web UI Ensures that files which should be in LFS are transformed into LFS pointers Uses Lfs::Transformer which then links LfsObjectProjects on success
* | | Merge branch '44235-update-knapsack-to-1.16.0' into 'master'Grzegorz Bizon2018-03-161-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update knapsack to 1.16.0 Closes #44235 See merge request gitlab-org/gitlab-ce!17735
| * | | Update knapsack to 1.16.0Takuya Noguchi2018-03-141-0/+5
| | | |
* | | | Merge branch 'sh-cache-table-exists' into 'master'Yorick Peterse2018-03-161-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache table_exists?('application_settings') to reduce repeated schema reloads Closes #43355 See merge request gitlab-org/gitlab-ce!17781
| * | | | Cache table_exists?('application_settings') to reduce repeated schema reloadssh-cache-table-existsStan Hu2018-03-151-0/+5
| | | | | | | | | | | | | | | | | | | | Closes #43355
* | | | | Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-161-0/+5
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | Cache column_exists? for application settings See merge request gitlab-org/gitlab-ce!17780
| * | | Cache column_exists? for application settingssh-cache-column-existsStan Hu2018-03-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is most a backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4987/diffs but includes other columns that use column_exists? in a way that may cause unnecessary schema loads.
* | | | Update CHANGELOG.md for 10.5.5Ian Baum2018-03-155-25/+0
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'jivl-realtime-update-adding-file' into 'master'Phil Hughes2018-03-151-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add realtime pipeline status component for files Closes #42927 See merge request gitlab-org/gitlab-ce!17705
| * | | | Add realtime pipeline status component for filesJose Ivan Vargas2018-03-141-0/+5
| |/ / /
* | | | Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' ↵Stan Hu2018-03-151-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reduce Redis usage from merge request diffs caching" Closes #44191 See merge request gitlab-org/gitlab-ce!17746
| * | | | Only cache highlight results for latest MR diffsSean McGivern2018-03-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we kept them all in the cache. We don't need the highlight results for older diffs - if someone does view that (which is rare), we can do the highlighting on the fly.
* | | | | Merge branch 'adamco/gitlab-ce-move-issue-command' into 'master'Grzegorz Bizon2018-03-151-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add slash command for moving an issue See merge request gitlab-org/gitlab-ce!17691
| * | | | | Add slash command for moving an issueSean McGivern2018-03-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Carried over from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8857
* | | | | | Merge branch 'fix-42459-#-in-branch' into 'master'Sean McGivern2018-03-151-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually escape '#' when building relative uris, closes #42459 Closes #42459 See merge request gitlab-org/gitlab-ce!17679
| * | | | | Manually escape '#' when building relative uris, fixes #42459Jan2018-03-111-0/+5
| | | | | |
* | | | | | Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-141-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix moving local, unhashed upload or pages directories during group transfer Closes #43993 See merge request gitlab-org/gitlab-ce!17658
| * | | | | | Fix moving local files during namespace transferMichael Kozono2018-03-131-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'Robert Speicher2018-03-141-0/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0 (CVE-2017-11428, CVE-2017-11430) Closes #43806 See merge request gitlab-org/gitlab-ce!17734
| * | | | | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0Takuya Noguchi2018-03-141-0/+5
| | | | | |
* | | | | | Merge branch 'bvl-import-zip-multiple-assignees' into 'master'Sean McGivern2018-03-141-0/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import multiple issue assignees from GitLab export Closes #40275 See merge request gitlab-org/gitlab-ce!17718
| * | | | | Import multiple issue assignees from GitLab exportBob Van Landuyt2018-03-141-0/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing from a GitLab archive, an admin can carry over the assignations. Other users can not. When a regular user is importing an issue with multiple assignees, the assignee is replaced with the current user, meaning we would try to insert current user as an assignee multiple times. By filtering the array before storing it, the import becomes more robust.
* | | | | Merge branch '43717-breadcrumb-on-admin-runner-page' into 'master'Sean McGivern2018-03-141-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breadcrumb on Admin Runner page Closes #43717 See merge request gitlab-org/gitlab-ce!17431
| * | | | | Set breadcrumb for admin/runners/showTakuya Noguchi2018-03-141-0/+5
| | | | | |
* | | | | | Merge branch '44160-update-foreman-to-0.84.0' into 'master'Grzegorz Bizon2018-03-141-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update foreman to 0.84.0 Closes #44160 See merge request gitlab-org/gitlab-ce!17690
| * | | | | | Update foreman from 0.78.0 to 0.84.0Takuya Noguchi2018-03-131-0/+5
| | | | | | |
* | | | | | | Merge branch 'fix-emoji-popup' into 'master'Sean McGivern2018-03-141-0/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide emoji popup after multiple spaces or blank lines, closes #40620,#33678 Closes #40620 and #33678 See merge request gitlab-org/gitlab-ce!17680
| * | | | | | Hide emoji popup after multiple spaces or blank linesJan Beckmann2018-03-111-0/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Fixes #40620,#33678
* | | | | | Merge branch '44024-fix-table-extra-column' into 'master'Clement Ho2018-03-131-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown table showing extra fake column v1 Closes #44024 See merge request gitlab-org/gitlab-ce!17669
| * | | | | | Fix markdown table showing an extra rake column44024-fix-table-extra-columnEric Eastwood2018-03-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/44024
* | | | | | | Add Gitaly call details to the performance barSean McGivern2018-03-131-0/+5
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | The same as the SQL queries, show the details of Gitaly calls in the performance bar, as a modal that can be opened in the same way.
* | | | | | Resolve "Projects::MergeRequestsController#show is slow (implement skeleton ↵Simon Knox2018-03-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | loading)"
* | | | | | Merge branch '43720-update-fe-webpack-docs' into 'master'Jacob Schatz2018-03-131-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Document webpack_bundle_tag replacement method" Closes #43720 and #42704 See merge request gitlab-org/gitlab-ce!17706
| * | | | | | update node and yarn dependencies within install/upgrade docsMike Greiling2018-03-121-0/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into 44149-issue-comment-buttonsFilipa Lacerda2018-03-139-0/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (29 commits) Fix provider server URL used when listing repos to import Fix inconsistent punctuation on MR form Update dependency for svgs Fix timestamp to include %M instead of %I for post-deploy migrations. Use Gitaly 0.89.0 Resolve "Hover style for sidebar dropdowns is wrong" fixed spec Respect the protocol in `expose_url` Fix removes source branch text being rendered in merged state Fix code and wiki search results when filename is non-ASCII Include the ee/ directory in backtraces Use GitLab fork of zaproxy Updates file extensions on Vue docs fixed note polling not sending updated last fetched at date added spec for polling Add changelog entry Use `list.id` for `:key` added mutation spec Bump parser and unparser gems to remove warnings fix polling not working correctly Fixed issue notes being duplicated ...
| * \ \ \ \ \ Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵Douwe Maan2018-03-121-0/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
| | * | | | | Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importingRubén Dávila2018-03-121-0/+5
| | | |/ / / | | |/| | | | | | | | | | | | | | | Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
| * | | | | Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into ↵Clement Ho2018-03-121-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move NothingToMerge vue component See merge request gitlab-org/gitlab-ce!17544
| | * | | | | Move NothingToMerge vue componentGeorge Tsiolis2018-03-081-0/+5
| | | | | | |
| * | | | | | Resolve "Hover style for sidebar dropdowns is wrong"Lukas Eipert2018-03-121-0/+5
| | | | | | |
| * | | | | | Respect the protocol in `expose_url`Toon Claes2018-03-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When https is configured in the URL, also use that, and do not set it to http. Closes gitlab-org/gitlab-ee#5217
| * | | | | | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-121-0/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarily See merge request gitlab-org/gitlab-ce!17630
| | * | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-071-0/+5
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'add-indexes-to-todos-for-heavy-users-like-sean' into 'master'Yorick Peterse2018-03-121-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add partial indexes on todos to handle users with many todos See merge request gitlab-org/gitlab-ce!17668
| | * | | | | Add partial indexes on todos to handle users with many todosadd-indexes-to-todos-for-heavy-users-like-seanGreg Stark2018-03-091-0/+5
| | | | | | |
| * | | | | | Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-121-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code and wiki search results when filename is non-ASCII See merge request gitlab-org/gitlab-ce!17685