summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' Douwe Maan2017-05-041-7/+10
|\ | | | | | | | | | | | | Sort the network graph both by commit date and topographically Closes #30973 See merge request !11057
| * Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topoTimothy Andrew2017-05-041-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Previously, we sorted commits by date, which seemed to work okay. - The one edge case where this failed was when multiple commits have the same commit date (for example: when a range of commits are cherry picked with a single command, they all have the same commit date [and different author dates]). - Commits with the same commit date would be sorted arbitrarily, and usually break the network graph. - This commit solves the problem by both sorting by date, and by sorting topographically (parents aren't displayed until all their children are displayed) - Include review comments from @adamniedzielski A more detailed explanation is present here: https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
* | Merge branch 'gitlab-shell-compile' into 'master' Rémy Coutable2017-05-041-2/+8
|\ \ | | | | | | | | | | | | Compile gitlab-shell go executables See merge request !11039
| * | Compile gitlab-shell go executablesJacob Vosmaer2017-05-041-2/+8
| | |
* | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-043-3/+3
|\ \ \ | |/ / |/| | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022
| * | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-023-3/+3
| | |
* | | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵Sean McGivern2017-05-041-5/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle incoming emails from aliases correctly See merge request !11079
| * | | Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-comeSean McGivern2017-05-031-5/+11
| | | | | | | | | | | | | | | | | | | | These set the 'actual' destination email in one of the Delivered-To lines, so check those too.
* | | | Merge branch '31647-fix-snippet-content_html' into 'master' Rémy Coutable2017-05-042-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching large snippet HTML content on MySQL databases Closes #31647 See merge request !11024
| * | | | Fix caching large snippet HTML content on MySQL databasesNick Thomas2017-05-032-0/+3
| | |_|/ | |/| |
* | | | Merge branch '31544-size-of-project-from-api' into 'master' Rémy Coutable2017-05-041-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Size of project from API" Closes #31544 See merge request !11013
| * | | | Expose project statistics on single requests via the APIMark Fletcher2017-05-031-5/+9
| | |_|/ | |/| | | | | | | | | | | | | | | | | | + The statistics parameter was already accepted * This commit ensure that it is respected for GET /projects/:id endpoint + Add documentation of the parameter and update the example response for stats
* | | | Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵Douwe Maan2017-05-031-21/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' removes the possibility of commit messages having carriage returns Closes #31671 See merge request !11077
| * | | | removes the possibility of commit messages having carriage returnsTiago Botelho2017-05-031-21/+0
| | | | |
* | | | | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-031-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048
| * | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-2/+10
| | |_|/ / | |/| | |
* | | | | Fix project tree saver and fork spec failuresJames Lopez2017-05-031-0/+1
| |_|_|/ |/| | |
* | | | Merge branch ↵Robert Speicher2017-05-032-4/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28408-feature-proposal-include-search-options-to-pipelines-api' into 'master' Resolve "Feature Proposal: Include search options to pipelines API" Closes #28408 See merge request !9367
| * | | | Improve documentationShinya Maeda2017-05-031-5/+5
| | | | |
| * | | | Add constant as ALLOWED_INDEXED_COLUMNSShinya Maeda2017-05-031-1/+1
| | | | |
| * | | | Use HasStatus::AVAILABLE_STATUSES instead of hard codingShinya Maeda2017-05-031-1/+1
| | | | |
| * | | | Revert "Use JSON type for sorting parameter (halfway)"Shinya Maeda2017-05-031-4/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit 34127cb13ad72f65a24bdc8fc051363d3edd77cb.
| * | | | Use JSON type for sorting parameter (halfway)Shinya Maeda2017-05-031-4/+4
| | | | |
| * | | | No need to support sha for sortingShinya Maeda2017-05-031-1/+1
| | | | |
| * | | | Reduce playable columns for sortingShinya Maeda2017-05-031-1/+1
| | | | |
| * | | | Add name(User)Shinya Maeda2017-05-031-1/+2
| | | | |
| * | | | Fix how to use PipelinesFinderShinya Maeda2017-05-032-2/+2
| | | | |
| * | | | %[] to %w[]Shinya Maeda2017-05-031-4/+4
| | | | |
| * | | | %w() to %[]Shinya Maeda2017-05-031-5/+5
| | | | |
| * | | | Fix rubocop offences and rspec failuresShinya Maeda2017-05-031-3/+3
| | | | |
| * | | | Add specs. Plus, minor fixes.Shinya Maeda2017-05-031-1/+1
| | | | |
| * | | | Fixed those points.Shinya Maeda2017-05-031-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - username to user_id - Drop duration - Resolve comments - Add Changelog - Edit docs
| * | | | - Add new parameters for Pipeline APIShinya Maeda2017-05-031-1/+11
| | | | | | | | | | | | | | | | | | | | - Expand PipelinesFinder functions
* | | | | Fix lazy error handling of cron parserDosuken shinya2017-05-031-2/+17
| | | | |
* | | | | Merge branch 'emoji-button-titles' into 'master' Filipa Lacerda2017-05-032-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added emoji description title to award emoji buttons Closes #29971 See merge request !10881
| * \ \ \ \ Merge branch 'master' into emoji-button-titlesPhil Hughes2017-04-274-32/+23
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into emoji-button-titlesPhil Hughes2017-04-2745-195/+1188
| |\ \ \ \ \ \
| * | | | | | | Moved the title onto the emoji tagPhil Hughes2017-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the description in all places emojis are used
| * | | | | | | Added back yarn:check to rake task...Phil Hughes2017-04-241-1/+1
| | | | | | | |
| * | | | | | | Added emoji description title to award emoji buttonsPhil Hughes2017-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #29971
* | | | | | | | Include missing project attributes to Import/ExportJames Lopez2017-05-033-8/+31
| | | | | | | |
* | | | | | | | Merge branch 'fix-n-plus-one-project-features' into 'master' Rémy Coutable2017-05-031-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove N+1 queries when checking nodes visible to user See merge request !11040
| * | | | | | | Remove N+1 queries when checking nodes visible to userfix-n-plus-one-project-featuresSean McGivern2017-05-021-1/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | N in this case is low, as it's the number of distinct projects referenced from MRs, rather than the number of MRs referenced (issues use their own optimization). Still, on issues or MRs which are often referenced from MRs, it will save a few queries.
* | | | | | | Merge branch 'fix-gitaly-not-found' into 'master' Douwe Maan2017-05-022-34/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable ref operations with gitaly after not-found fix See merge request !10773
| * | | | | | | Re-enable ref operations with gitaly after not-found fixfix-gitaly-not-foundAlejandro Rodríguez2017-05-022-34/+32
| | | | | | | |
* | | | | | | | Merge branch '30272-bvl-reject-more-namespaces' into 'master' Douwe Maan2017-05-0210-20/+404
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject more reserved paths Closes #30272 See merge request !10413
| * | | | | | | Update commentsBob Van Landuyt2017-05-021-0/+8
| | | | | | | |
| * | | | | | | Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidatorBob Van Landuyt2017-05-021-0/+4
| | | | | | | |
| * | | | | | | Rename child namespaces in migrationhelpersBob Van Landuyt2017-05-012-2/+7
| | | | | | | |
| * | | | | | | Clear html cache for a projects milestonesBob Van Landuyt2017-05-011-0/+4
| | | | | | | |
View Lorry Controller Status