summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Show un-highlighted diffs when blobs are the samefix-old-mr-diffsSean McGivern2017-08-233-5/+54
| | | | | | For some old merge requests, we don't have enough information to figure out the old blob and the new blob for the file. This means that we can't highlight the diff correctly, but we can still display it without highlighting.
* Always return a simple diff viewerSean McGivern2017-08-222-0/+16
| | | | | We didn't have a fallback case before, because we believed the conditions were exhaustive. They weren't, so we can always fallback to not previewing.
* Merge branch 'fix/import-fork-mr' into 'master'Sean McGivern2017-08-226-2/+29
|\ | | | | | | | | | | | | Fix Import/Export issue to do with fork merge requests Closes #36666 See merge request !13717
| * fix static analysisfix/import-fork-mrJames Lopez2017-08-221-2/+0
| |
| * fix specsJames Lopez2017-08-221-1/+6
| |
| * add changelogJames Lopez2017-08-211-0/+5
| |
| * Fix fork MRs importing issueJames Lopez2017-08-215-2/+21
| |
* | Merge branch 'fix-broadcast-message-caching' into 'master'Sean McGivern2017-08-223-5/+55
|\ \ | | | | | | | | | | | | | | | | | | Fix caching of future broadcast messages Closes #36661 See merge request !13667
| * | Fix caching of future broadcast messagesfix-broadcast-message-cachingYorick Peterse2017-08-213-5/+55
| |/ | | | | | | | | | | | | | | | | This changes the caching mechanism so we cache both current _and_ future broadcast messages, then manually filter out those we don't want to display. This ensures we don't need any additional queries while still being able to display the right messages at the right time. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36661
* | Update VERSION to 9.6.0-prev9.6.0.preSimon Knox2017-08-221-1/+1
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSimon Knox2017-08-224-33/+94
|\ \
| * \ Merge branch '34533-inline-single-authorized-projects' into 'master'Douwe Maan2017-08-224-33/+94
| |\ \ | | | | | | | | | | | | | | | | Use an event-based system when waiting for AuthorizedProjectsWorker to complete See merge request !13564
| | * | Use event-based waiting in Gitlab::JobWaiterNick Thomas2017-08-224-33/+94
| | | |
* | | | Update CHANGELOG.md for 9.5.0Simon Knox2017-08-22148-604/+166
|/ / / | | | | | | [ci skip]
* | | Merge branch '35845-improve-subgroup-creation-permissions' into 'master'Douwe Maan2017-08-228-12/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improves subgroup creation permissions Closes #35845 See merge request !13418
| * | | Improves subgroup creation permissions35845-improve-subgroup-creation-permissionsTiago Botelho2017-08-218-12/+74
| | | |
* | | | Merge branch '28283-uuid-storage' into 'master'Douwe Maan2017-08-2221-162/+498
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed Storage support for Repositories Closes #28283 See merge request !13246
| * | | | Make sure repository's removal work for legacy and hashed storages28283-uuid-storageGabriel Mazetto2017-08-227-8/+67
| | | | |
| * | | | Use `@hashed` prefix for hashed paths on disk, to avoid collision with ↵Gabriel Mazetto2017-08-222-5/+7
| | | | | | | | | | | | | | | | | | | | existing ones
| * | | | Refactor project and storage typesGabriel Mazetto2017-08-227-87/+69
| | | | |
| * | | | Prevent using gitlab import task when hashed storage is enabledGabriel Mazetto2017-08-221-0/+6
| | | | |
| * | | | Some codestyle changes and fixes for GitLab pagesGabriel Mazetto2017-08-222-10/+20
| | | | |
| * | | | Removed some useless code, codestyle changes and removed an indexGabriel Mazetto2017-08-226-12/+7
| | | | |
| * | | | Fix repository reloading in some specsGabriel Mazetto2017-08-223-4/+8
| | | | |
| * | | | ChangelogGabriel Mazetto2017-08-221-0/+4
| | | | |
| * | | | Moving away from the "extend" based factory to a more traditional one.Gabriel Mazetto2017-08-225-36/+54
| | | | | | | | | | | | | | | | | | | | | | | | | Using `extend` dynamically can lead to bad performance as it invalidates the method's cache.
| * | | | Enable automatic hashed storage for new projects by application settingsGabriel Mazetto2017-08-225-0/+35
| | | | |
| * | | | New storage is now "Hashed" instead of "UUID"Gabriel Mazetto2017-08-228-88/+203
| | | | |
| * | | | Add UUID Storage to ProjectGabriel Mazetto2017-08-224-1/+108
| | | | |
| * | | | Move create_repository back to project model as we can use disk_path and ↵Gabriel Mazetto2017-08-222-13/+13
| | | | | | | | | | | | | | | | | | | | share it
| * | | | Codestyle: move hooks to the same place and move dependent methods to privateGabriel Mazetto2017-08-221-19/+18
|/ / / /
* | | | Merge branch 'gitaly-tree-entries-encoding' into 'master'36778-url-redirection-from-old-note-attachments-path-to-new-uploads-path-not-working36775-move-helm-chart-data-to-gitlab-ce-repo-instead-of-omnibus-docsRobert Speicher2017-08-212-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly encode string params for Gitaly's TreeEntries RPC Closes #36720 See merge request !13724
| * | | | Correctly encode string params for Gitaly's TreeEntries RPCgitaly-tree-entries-encodingAlejandro Rodríguez2017-08-212-2/+16
| | |_|/ | |/| |
* | | | Merge branch ↵Clement Ho2017-08-2111-27/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36298-use-non-i18n-values-for-setting-new-group-level-issue-mr-button-text' into 'master' Use non-i18n values for setting new group-level issue/MR button text Closes #36298 See merge request !13570
| * | | | Use non-i18n values for setting new group-level issue/MR button textBryce Johnson2017-08-2111-27/+69
|/ / / /
* | | | Merge branch ↵Marcia Ramos2017-08-2110-8/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36533-add-docs-for-group-issues-page-and-group-merge-requests-page' into 'master' Add docs for group issues page and group merge requests page Closes #36533 See merge request !13678
| * | | | indexes external issue trackerMarcia Ramos2017-08-211-0/+6
| | | | |
| * | | | copyeditMarcia Ramos2017-08-214-21/+25
| | | | |
| * | | | indexes user/search/ from /user/indexMarcia Ramos2017-08-211-0/+4
| | | | |
| * | | | Wording36533-add-docs-for-group-issues-page-and-group-merge-requests-pageVictor Wu2017-08-211-5/+5
| | | | |
| * | | | Cross link to groups docsVictor Wu2017-08-211-0/+7
| | | | |
| * | | | Issue trackerVictor Wu2017-08-211-1/+1
| | | | |
| * | | | Merge requests search and filteringVictor Wu2017-08-181-0/+251
| | | | |
| * | | | Delete index.mdVictor Wu2017-08-181-251/+0
| | | | |
| * | | | Punctuation.Victor Wu2017-08-181-2/+2
| | | | |
| * | | | Search and filter results.Victor Wu2017-08-181-1/+3
| | | | |
| * | | | Update search and filter linksVictor Wu2017-08-181-1/+3
| | | | |
| * | | | Update search docsVictor Wu2017-08-181-0/+4
| | | | |
| * | | | Merge request list viewsVictor Wu2017-08-181-0/+16
| | | | |
| * | | | project_merge_requests_list_view.pngVictor Wu2017-08-181-0/+0
| | | | |
View Lorry Controller Status