summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-072-2/+4
| | | | | These scopes don't care about the order. Removing the explicit "ORDER BY" can speed up the queries by a little bit.
* Fixed issue sorting specs for ID changesYorick Peterse2016-01-071-6/+6
| | | | | These specs assumed data was still sorted by timestamp, instead of by ID.
* Updated Gemfile.lock due to Bundler re-orderingYorick Peterse2016-01-071-5/+5
| | | | | Bundler keeps re-ordering this particular Gem every time something is executed using "bundle exec".
* Drop projects order in IssuableFinderYorick Peterse2016-01-071-2/+2
| | | | | | When grabbing the projects to filter issues by we don't care about the order they're returned in. By removing the ORDER BY the resulting query can be quite a bit faster.
* Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-072-2/+2
| | | | | | | This replaces plucking of IDs with a sub-query, saving the overhead of loading the data in Ruby and then mapping the rows to an Array of IDs. This also scales much better when dealing with a large amount of IDs that would be involved.
* Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-073-3/+6
| | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead.
* Added an index on milestones.titleYorick Peterse2016-01-071-0/+5
| | | | | | Certain pages (e.g. the group wide issues page) filter miletones by their title. Without an index this will result in a sequence scan on a large dataset increasing the total loading time of a page.
* Merge branch 'remove-more-influxdb-tags' into 'master' Yorick Peterse2016-01-074-10/+23
|\ | | | | See merge request !2328
| * Store request methods/URIs as valuesYorick Peterse2016-01-074-6/+21
| | | | | | | | | | | | | | Since filtering by these values is very rare (they're mostly just displayed as-is) we don't need to waste any index space by saving them as tags. By storing them as values we also greatly reduce the number of series in InfluxDB.
| * Removed UUIDs from metrics transactionsYorick Peterse2016-01-072-5/+3
| | | | | | | | | | While useful for finding out what methods/views belong to a transaction this might result in too much data being stored in InfluxDB.
* | Merge branch 'find-file-credit' into 'master' Douwe Maan2016-01-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Credit koreamic for creating Find File See merge request !2327
| * | Credit koreamic for creating Find FileDouwe Maan2016-01-071-1/+1
| | |
* | | Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master' Dmitriy Zaporozhets2016-01-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Suggest prefacing find command with sudo when base permissions are wrong Closes #5872 See merge request !2299
| * | | Suggest prefacing find command with sudo when base permissions are wrongStan Hu2016-01-051-1/+1
| | | | | | | | | | | | | | | | Closes #5872
* | | | Merge branch 'fix-missing-day-in-network-graph' into 'master' Dmitriy Zaporozhets2016-01-072-1/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing date of month in network graph when commits span a month Closes #3635, #1383 Before: ![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png) After: ![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png) See merge request !2325
| * | | Fix missing date of month in network graph when commits span a monthStan Hu2016-01-062-1/+2
| | | | | | | | | | | | | | | | Closes #3635, #1383
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-070-0/+0
|\ \ \ \
| * \ \ \ Merge pull request #9889 from koreamic/file_finderDouwe Maan2016-01-0725-9/+473
| |\ \ \ \ | | | | | | | | | | | | Add new feature to find file(recreate)
| | * | | | Add new feature to find filekoreamic2016-01-0725-9/+473
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the fuzzy filter, develop "file finder" feature. - feedback(http://feedback.gitlab.com/forums/176466-general/suggestions/4987909-add-file-finder-fuzzy-input-in-files-tab-to-ju ) - fuzzy filter(https://github.com/jeancroy/fuzzaldrin-plus) - shortcuts(when "t" was hitted at tree view, go to 'file find' page and 'esc' is to go back) - depends on gitlab_git 7.2.22
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-0725-9/+473
| |_|_|/ |/| | |
* | | | Merge branch 'revert-influxdb-milliseconds' into 'master' Yorick Peterse2016-01-074-14/+6
|\ \ \ \ | | | | | | | | | | See merge request !2326
| * | | | Revert "Store SQL/view timings in milliseconds"Yorick Peterse2016-01-074-14/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7549102bb727daecc51da84af39956b32fc41537. Apparently I was wrong about ActiveSupport::Notifications::Event#duration returning the duration in seconds, instead it returns it in milliseconds already.
* | | | Merge branch 'doc_enable_disable_ci' into 'master' Achilleas Pipinellis2016-01-074-0/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on enabling/disabling GitLab CI Closes #4289 See merge request !2320
| * | | | Fix hyphenation typos [ci skip]Achilleas Pipinellis2016-01-071-7/+7
| | | | |
| * | | | Add documentation on enabling/disabling GitLab CIdoc_enable_disable_ciAchilleas Pipinellis2016-01-064-0/+72
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-075-26/+16
|\ \ \ \ \ | |_|/ / / |/| | | | See merge request !2319
| * | | | Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-065-26/+16
| | | | | | | | | | | | | | | | | | | | | | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
* | | | | Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-067-76/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Open Graph data for group, project and commit. See merge request !2211
| * \ \ \ \ Merge branch 'master' into more-opengraphmore-opengraphDouwe Maan2016-01-0615-60/+251
| |\ \ \ \ \
| * | | | | | Don't override issue page description in project layout.Douwe Maan2016-01-065-14/+9
| | | | | | |
| * | | | | | Remove now-redundant `page_description` call from Groups#showRobert Speicher2016-01-051-2/+0
| | | | | | |
| * | | | | | Remove now-redundant `page_description` call from Projects#showRobert Speicher2016-01-051-3/+1
| | | | | | |
| * | | | | | Make `page_description` less magical :sparkles:Robert Speicher2016-01-054-42/+11
| | | | | | |
| * | | | | | Use `User#avatar_url` instead of `avatar_icon` helperRobert Speicher2016-01-052-41/+20
| | | | | | |
| * | | | | | Merge branch 'master' into more-opengraphDouwe Maan2016-01-05174-1610/+3219
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml
| * | | | | | | Use `assign` instead of `instance_variable_set`Robert Speicher2015-12-271-7/+7
| | | | | | | |
| * | | | | | | Add specs for page_image using a Group's avatarRobert Speicher2015-12-271-0/+16
| | | | | | | |
| * | | | | | | Add Open Graph data for group, project and commit.Douwe Maan2015-12-255-6/+14
| | | | | | | |
* | | | | | | | Merge branch 'merge-when-build-succeeds-unchecked' into 'master' Robert Speicher2016-01-065-8/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running The Merge when build succeeds service only merges when the MR is mergeable (open, not WIP, no conflicts). When the target branch is updated, all affected MRs have their merge status set to `unchecked`, and the conflicts check will only happen when `check_if_can_be_merged` is called, which happens when the MR page is viewed. When someone enables the automatic merge, the target branch is updated, no-one views the MR page again, and the build succeeds, the mergeability check will fail and the MR will not in fact be merged. This MR makes sure `check_if_can_be_merged` is always called when MR mergeability is checked. See merge request !2304
| * \ \ \ \ \ \ \ Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-0615-60/+251
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵Douwe Maan2016-01-055-8/+15
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | target branch while builds were running
* | | | | | | | Merge branch 'rs-issue-1697' into 'master' Douwe Maan2016-01-061-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a limited set of filters for SingleLinePipeline Removes the following filters from its parent GfmPipeline: - SyntaxHighlightFilter - UploadLinkFilter - TableOfContentsFilter - LabelReferenceFilter - TaskListFilter Closes #1697 See merge request !2257
| * | | | | | | | Define a limited set of filters for SingleLinePipeliners-issue-1697Robert Speicher2016-01-051-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the following filters from its parent GfmPipeline: - SyntaxHighlightFilter - UploadLinkFilter - TableOfContentsFilter - LabelReferenceFilter - TaskListFilter Closes #1697
* | | | | | | | | Merge branch 'fix-banzai-cache' into 'master' Robert Speicher2016-01-063-17/+24
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentionable reference extraction caching. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130 Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283 See merge request !2315
| * | | | | | | | Add regression test.fix-banzai-cacheDouwe Maan2016-01-061-1/+14
| | | | | | | | |
| * | | | | | | | Fix mentionable reference extraction caching.Douwe Maan2016-01-061-2/+5
| | | | | | | | |
| * | | | | | | | Revert "Temporarily disable Markdown caching"Douwe Maan2016-01-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d337d5e7137d9b3fd0f9b8890a3ba9296323acc7.
| * | | | | | | | Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue."Douwe Maan2016-01-061-14/+7
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit 4b027bc93a7875c3937f6b90ac1049b4a4d72da5.
* | | | | | | | Merge branch 'metrics-milliseconds' into 'master' Yorick Peterse2016-01-064-6/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | See merge request !2316
| * | | | | | | | Store SQL/view timings in millisecondsYorick Peterse2016-01-064-6/+14
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction timings are also already stored in milliseconds, this keeps things consistent.
View Lorry Controller Status