summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix repo editor scrollbarfix-repo-scrollbarClement Ho2017-08-241-1/+0
|
* Merge branch 'zj-fix-fe-blank-button' into 'master'Clement Ho2017-08-231-1/+1
|\ | | | | | | | | | | | | Fix blank button not resetting project template value Closes #36816 See merge request !13757
| * Fix blank button not resetting project template valueZeger-Jan van de Weg2017-08-231-1/+1
| | | | | | | | The button didn't override a value, so the old value was posted again.
* | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-2312-28/+109
|\ \ | | | | | | | | | | | | | | | | | | Cache the number of open issues and merge requests Closes #36622 See merge request !13639
| * | Cache the number of open issues and merge requestsYorick Peterse2017-08-2312-28/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every project page displays a navigation menu that in turn displays the number of open issues and merge requests. This means that for every project page we run two COUNT(*) queries, each taking up roughly 30 milliseconds on GitLab.com. By caching these numbers and refreshing them whenever necessary we can reduce loading times of all these pages by up to roughly 60 milliseconds. The number of open issues does not include confidential issues. This is a trade-off to keep the code simple and to ensure refreshing the data only needs 2 COUNT(*) queries instead of 3. A downside is that if a project only has 5 confidential issues the counter will be set to 0. Because we now have 3 similar counting service classes the code previously used in Projects::ForksCountService has mostly been moved to Projects::CountService, which in turn is reused by the various service classes. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36622
* | | Merge branch 'bvl-improve-bare-project-import' into 'master'Sean McGivern2017-08-231-0/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make the import take subgroups into account Closes #36664 and #30546 See merge request !13670
| * | | Migrate creation of nested groups into a serviceBob Van Landuyt2017-08-231-0/+45
| | |/ | |/|
* | | Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-232-3/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove tooltip from filtered search user Closes #36696 See merge request !13752
| * | | Remove tooltip from filtered search userremove-tooltip-filtered-search-userClement Ho2017-08-222-3/+10
| | | |
* | | | Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern2017-08-234-11/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix displaying events of removed events and events without commit messages Closes #36685 and #36722 See merge request !13721
| * | | | Fix display of push events for removed refsfix-push-events-branch-removalsYorick Peterse2017-08-224-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the style of push events that remove tags or branches so they don't display the commit details. This prevents displaying commit details such as: 000000 . --broken encoding Instead we now simply display the header such as: Administrator deleted branch example-branch This is displayed in the same style as events for newly created branches/tags. This commit also ensures that if no commit message is present we simply don't display anything, instead of "--broken encoding". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
* | | | | Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into ↵Douwe Maan2017-08-231-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add migration to remove pending delete projects with non-existing namespace Closes #36541 See merge request !13598
| * | | | | Use EachBatch concern to loop over batchestc-remove-nonexisting-namespace-pending-delete-projectsToon Claes2017-08-221-5/+1
| | | | | |
| * | | | | Migration to remove pending delete projects with non-existing namespaceToon Claes2017-08-221-1/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There might be some projects where the namespace was removed, but the project wasn't. For these the projects still have a `namespace_id` set. So this adds a post-deploy migration remove all projects that are pending delete, and have a `namespace_id` that is non-existing.
* | | | | Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan2017-08-232-10/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a potential timeout in `Gitlab::Logger.read_latest` See merge request !13751
| * | | | | Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-222-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should be defining the list of loggers in the controller, not the view.
* | | | | | Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan2017-08-231-6/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inability to test some project integrations Closes gitlab-ee#3194 See merge request !13729
| * | | | | Fix inability to test some project integrationsfix-broken-testing-of-some-integrationsRubén Dávila2017-08-221-6/+3
| | | | | |
* | | | | | Implement new system note iconsBryce Johnson2017-08-2316-18/+29
| |_|_|/ / |/| | | |
* | | | | Merge branch '36496-badges-should-not-be-huge' into 'master'Clement Ho2017-08-221-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Badges should not be HUGE" Closes #36496 See merge request !13635
| * | | | | Sometimes you don't see the forrest because of all the trees, set now the ↵36496-badges-should-not-be-hugeTim Zallmann2017-08-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | preloading sizes to specific lazy class
* | | | | | Merge branch 'update-monaco-loader-test' into 'master'Jacob Schatz2017-08-222-5/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Fix monaco loader test See merge request !13682
| * | | | | add global __webpack_public_path__ to eslint configupdate-monaco-loader-testMike Greiling2017-08-182-5/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'git-gc-raise-lease-timeotu' into 'master'Sean McGivern2017-08-221-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Raise Git GC (Housekeeping) Lease Timeout to 24h See merge request !13719
| * | | | | Raise GC Lease Timeout to 24hgit-gc-raise-lease-timeotuKim "BKC" Carlbäcker2017-08-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix/sm/34762-bad-validation-message' into 'master'Kamil Trzciński2017-08-221-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce namespace of Kubernetes to lowercase Closes #34762 See merge request !13732
| * | | | | | Enfouce namespace for Kubernetes to lowercaseShinya Maeda2017-08-221-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '36721-rename-repo-text' into 'master'Annabel Dunstone Gray2017-08-221-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36721 Remove incorrect paragraph regarding renaming repos in settings Closes #36721 See merge request !13718
| * | | | | | 36721 Remove incorrect paragraph regarding renaming repos in settings36721-rename-repo-texttauriedavis2017-08-211-2/+0
| | | | | | |
* | | | | | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-221-2/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update form to properly set the path Closes #36519 See merge request !13722
| * | | | | | Update form to properly set the pathZeger-Jan van de Weg2017-08-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes a change in allowing uploaded files, as there was a mismatch in object_id between classes, disallowing params[:file], which is a UploadedFile, newly loaded. The params checked against the older version. Fixes gitlab-org/gitlab-ce#36519
* | | | | | | Merge branch 'fix-broadcast-message-caching' into 'master'Sean McGivern2017-08-221-5/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching of future broadcast messages Closes #36661 See merge request !13667
| * | | | | | | Fix caching of future broadcast messagesfix-broadcast-message-cachingYorick Peterse2017-08-211-5/+27
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch '34533-inline-single-authorized-projects' into 'master'Douwe Maan2017-08-221-3/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use an event-based system when waiting for AuthorizedProjectsWorker to complete See merge request !13564
| * | | | | | | Use event-based waiting in Gitlab::JobWaiterNick Thomas2017-08-221-3/+10
| | | | | | | |
* | | | | | | | Merge branch '35845-improve-subgroup-creation-permissions' into 'master'Douwe Maan2017-08-224-6/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves subgroup creation permissions Closes #35845 See merge request !13418
| * | | | | | | | Improves subgroup creation permissions35845-improve-subgroup-creation-permissionsTiago Botelho2017-08-214-6/+14
| | | | | | | | |
* | | | | | | | | Make sure repository's removal work for legacy and hashed storages28283-uuid-storageGabriel Mazetto2017-08-223-3/+9
| | | | | | | | |
* | | | | | | | | Use `@hashed` prefix for hashed paths on disk, to avoid collision with ↵Gabriel Mazetto2017-08-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | existing ones
* | | | | | | | | Refactor project and storage typesGabriel Mazetto2017-08-223-80/+62
| | | | | | | | |
* | | | | | | | | Some codestyle changes and fixes for GitLab pagesGabriel Mazetto2017-08-221-1/+2
| | | | | | | | |
* | | | | | | | | Removed some useless code, codestyle changes and removed an indexGabriel Mazetto2017-08-223-7/+5
| | | | | | | | |
* | | | | | | | | Fix repository reloading in some specsGabriel Mazetto2017-08-223-4/+8
| | | | | | | | |
* | | | | | | | | Moving away from the "extend" based factory to a more traditional one.Gabriel Mazetto2017-08-223-34/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-223-0/+16
| | | | | | | | |
* | | | | | | | | New storage is now "Hashed" instead of "UUID"Gabriel Mazetto2017-08-223-9/+35
| | | | | | | | |
* | | | | | | | | Add UUID Storage to ProjectGabriel Mazetto2017-08-222-1/+66
| | | | | | | | |
* | | | | | | | | 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
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Use non-i18n values for setting new group-level issue/MR button textBryce Johnson2017-08-219-26/+33
| | | | | | | |