summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Add test for calculating correct jobs group nameszj-real-time-pipelinesold-zj-realtime-graphGrzegorz Bizon2017-05-061-0/+5
|
* Add specs for grouping method in `Ci::Stages` classGrzegorz Bizon2017-05-061-2/+26
|
* Improve specs for CI/CD jobs group classGrzegorz Bizon2017-05-061-21/+22
|
* Incorporate reviewZ.J. van de Weg2017-05-061-5/+5
|
* Incorporate reviewZ.J. van de Weg2017-05-051-1/+25
|
* Create static model Ci::GroupZ.J. van de Weg2017-05-051-0/+19
| | | | | | | | Now a new model is introduced, which is not persisted in the database, Ci::Group. Given a pipeline now has many stages, which in turn have many groups, we can clean up some code. Other than that, some misc changes are included to clean up.
* Merge branch 'backport-ee-4b464eaaee' into 'master' Robert Speicher2017-05-053-8/+30
|\ | | | | | | | | Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaee See merge request !11072
| * Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaeebackport-ee-4b464eaaeeRémy Coutable2017-05-043-8/+30
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'prometheus-integration-test-setting-fix' into 'master' Robert Speicher2017-05-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Added rescue block for the test method for the prometheus service Closes #31451 See merge request !10994
| * | Improved code styling and added a HTTParty rescue blockJose Ivan Vargas2017-05-041-3/+2
| | |
| * | Added rescue block for the test method for the prometheus serviceJose Ivan Vargas2017-05-041-2/+3
| |/
* | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0417-89/+558
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
| * | Update last_repository_updated_at when the wiki is updatedDouglas Barbosa Alexandre2017-05-041-6/+15
| | |
| * | Update last_repository_updated_at when a push event is createdDouglas Barbosa Alexandre2017-05-041-8/+34
| | |
| * | Set last_repository_updated_at to created_at upon project creationDouglas Barbosa Alexandre2017-05-041-0/+8
| |/
| * Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+44
| |\ | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018
| | * Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+44
| | |
| * | Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' Douwe Maan2017-05-041-3/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 'always-show-latest-pipeline-in-commit-box' into 'master' Kamil Trzciński2017-05-041-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always show latest pipeline info in commit box Closes #31378 See merge request !11038
| | * | | Rename latest_pipeline to last_pipelinealways-show-latest-pipeline-in-commit-boxLin Jen-Shin2017-05-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it might be confusing that it's not the same as Pipeline#latest Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11038#note_28677090
| * | | | Merge branch 'zj-chat-message-pretty-time' into 'master' Sean McGivern2017-05-041-9/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Convert seconds to minutes and hours on chat notifations See merge request !11054
| | * | | | Convert seconds to minutes and hours on chat notifationszj-chat-message-pretty-timeZ.J. van de Weg2017-05-041-9/+6
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the pipeline message, the duration of the pipeline was shown as: > gitlab-org/gitlab-ee: Pipeline #8002259 of master branch by Douwe Maan failed in 8612 seconds But this many seconds only gave me a clue how long the pipeline took, so now this will be shown as something like: 02:20:12 which gives a much better measure of time.
| * | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+21
| |/ / /
| * | | Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵Douwe Maan2017-05-031-7/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-7/+19
| | | | |
| * | | | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' Sean McGivern2017-05-035-42/+220
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388
| | * | | | Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diffDouwe Maan2017-05-035-42/+220
| | | |_|/ | | |/| | | | | | | | | | | | versions
| * | | | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-032-11/+119
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-032-11/+119
| | |/ / /
| * | | | Fix lazy error handling of cron parserDosuken shinya2017-05-031-0/+32
| | | | |
| * | | | Include missing project attributes to Import/ExportJames Lopez2017-05-031-0/+19
| |/ / /
* | | | Add CHANGELOG entry, some specs and locale file for German.Ruben Davila2017-05-041-0/+8
|/ / /
* | | Merge branch '30272-bvl-reject-more-namespaces' into 'master' Douwe Maan2017-05-025-0/+80
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Reject more reserved paths Closes #30272 See merge request !10413
| * | Refresh the markdown cache if it was `nil`Bob Van Landuyt2017-05-021-0/+6
| | | | | | | | | | | | | | | If the cached html_field for a markdown_field is `nil` while the mfarkdown_field is not, it needs to be refreshed.
| * | Reject group-routes as names of child namespacesBob Van Landuyt2017-05-013-0/+25
| | |
| * | The dynamic path validator can block out partial pathsBob Van Landuyt2017-05-012-0/+14
| | | | | | | | | | | | So we can block `objects` only when it is contained in `info/lfs` or `gitlab-lfs`
| * | Check `has_parent?` for determining validation typeBob Van Landuyt2017-05-011-0/+1
| | |
| * | Streamline the path validation in groups & projectsBob Van Landuyt2017-05-012-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Project` uses `ProjectPathValidator` which is now a `NamespaceValidator` that skips the format validation. That way we're sure we are using the same collection of reserved paths. I updated the path constraints to reflect the changes: We now allow some values that are only used on a top level namespace as a name for a nested group/project.
* | | Merge branch 'gitaly-branch-tag-count' into 'master' Sean McGivern2017-05-021-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly for getting Branch/Tag counts Closes gitaly#157 See merge request !10780
| * | | Cleanupgitaly-branch-tag-countKim "BKC" Carlbäcker2017-04-281-0/+5
| | | |
| * | | Use Gitaly for getting Branch/Tag countsKim "BKC" Carlbäcker2017-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Backup-rake-spec fixed. Storage config broken - Use rugged to compare branch/tag-count in specs - upgrade gitaly
* | | | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-011-9/+6
| | | |
* | | | Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-012-1/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use blob viewers for snippets See merge request !10747
| * | | | Use blob viewers for snippetsDouwe Maan2017-04-302-1/+59
| | |/ / | |/| |
* | | | Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quicklySean McGivern2017-05-011-13/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix Gitaly::Commit#is_ancestor Closes #30586 See merge request !10634
| * | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-281-13/+11
| |/ / | | | | | | | | | - Upgrade Gitaly-version
* | | Merge branch 'enable-spec-file-name-cop' into 'master' Robert Speicher2017-04-288-21/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec/FilePath cop Closes #31316 See merge request !10911
| * | | Enable RSpec/FilePath copenable-spec-file-name-copSean McGivern2017-04-268-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | - Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first
* | | | Merge branch 'dz-improve-add-users-method' into 'master' Douwe Maan2017-04-281-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Collect all users by single query when using Member#add_users See merge request !10975
View Lorry Controller Status