summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-251-0/+17
|\ | | | | | | | | | | | | Provide default for calculating label text color Closes #32728 See merge request !11681
| * Add failing test for #32728winh2017-05-251-0/+17
| |
* | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-4/+4
|\ \ | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| * | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-4/+4
| | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-251-1/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix terminals support for Kubernetes service Closes #31754 See merge request !11653
| * | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-251-1/+30
| | | | | | | | | | | | | | | | It was broken, because we introduced a default namespace, which was not used by terminal methods.
* | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-255-91/+91
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027
| * | | Implement web hooks loggingAlexander Randa2017-05-255-91/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover
* | | | ensure rss token on readAlexis Reigel2017-05-241-3/+5
| | | | | | | | | | | | | | | | | | | | we do this on attribute read since migrating all existing users is not a feasible solution.
* | | | add missing spec for incoming email token presenceAlexis Reigel2017-05-241-0/+7
| | | |
* | | | add rss_token attribute to user modelAlexis Reigel2017-05-241-0/+7
| |/ / |/| |
* | | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-243-3/+66
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add system note with link to diff comparison when MR discussion becomes outdated Closes #30058 See merge request !11584
| * | | Address reviewDouwe Maan2017-05-241-0/+26
| | | |
| * | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-232-3/+40
| | | |
* | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-241-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
| * | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-232-4/+4
| | | |
| * | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-232-5/+5
| | |/ | |/|
* | | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-232-7/+4
|\ \ \ | | | | | | | | | | | | | | | | Add transient head_pipeline_of to pipeline factories See merge request !11566
| * | | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-222-7/+4
| | | |
* | | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etagZ.J. van de Weg2017-05-221-0/+10
| |/ / |/| | | | | | | | These were untested by the cherry picked commit.
* | | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-191-0/+10
|/ /
* | Merge branch 'rubocop-empty-example-group' into 'master'Robert Speicher2017-05-182-6/+0
|\ \ | | | | | | | | | | | | Enable the RSpec/EmptyExampleGroup cop See merge request !11497
| * | Enable the RSpec/EmptyExampleGroup coprubocop-empty-example-groupRémy Coutable2017-05-182-6/+0
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-185-0/+125
|\ \ \ | |/ / |/| | | | | See merge request !11346.
| * | Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-175-0/+125
| | |
* | | Fixes #32474Michael Kozono2017-05-171-3/+13
|/ / | | | | | | Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
* | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-171-0/+27
| |
* | Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-05-171-0/+28
|\ \ | |/ |/| | | | | Invalidate cache for issue and MR counters separately See merge request !11394
| * Invalidate cache for issue and MR counters more granularlycounters_cache_invalidationValery Sizov2017-05-151-0/+28
| |
* | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-162-37/+40
|\ \ | | | | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358
| * | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to ↵dm-blob-viewer-concernsDouwe Maan2017-05-151-20/+20
| | | | | | | | | | | | max_size
| * | Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-132-17/+20
| | |
* | | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-nameAlejandro Rodríguez2017-05-161-19/+14
| |/ |/|
* | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-141-15/+0
|\ \ | |/ |/| | | | | | | | | Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
| * Add support for deltas_only under GitalyAhmad Sherif2017-05-131-15/+0
| | | | | | | | Closes gitaly#199
* | Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-121-0/+13
| |
* | Added repository_update hookGabriel Mazetto2017-05-121-0/+8
| |
* | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-65/+0
|\ \ | | | | | | | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-65/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-0/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
| * | | Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-111-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`.
* | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-123-17/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | | | Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-113-6/+7
| | | | | | | | | | | | | | | | | | | | + fix tests
| * | | | Custom queries for prometheusPawel Chojnacki2017-05-111-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* | | | | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-122-14/+14
| | | | |
* | | | | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern2017-05-122-82/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework update_assignee_cache_counts Closes #31873 See merge request !11270
| * | | | | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-122-82/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'protected-branches-no-one-merge' into 'master' Sean McGivern2017-05-122-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Enabled 'no one' as a merge access level in protected branches Closes #31541 See merge request !11232
| * | | | Added model specsPhil Hughes2017-05-122-0/+10
| | | | |
* | | | | Merge branch 'remove-deltas-only' into 'master' Sean McGivern2017-05-121-17/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deltas_only from DiffCollection Closes gitaly#224 See merge request !11285