summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-073-18/+44
|
* Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵Kamil Trzciński2017-05-062-41/+54
|\ | | | | | | | | | | | | | | | | | | 'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
| * Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-0514-75/+482
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits) Fixed Karma spec Reject EE reserved namespace paths in CE as well Updated webpack config Include the bundler:audit job into the static-analysis job Document serializers Add artifact file page that uses the blob viewer Pipeline table mini graph dropdown remains open when table is refreshed Adds off for event hub Compile gitlab-shell go executables Allow to create new branch and empty WIP merge request from issue page Moved to a view spec Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md Convert seconds to minutes and hours on chat notifations Disable navigation to Pages config if Pages is disabled Sort the network graph both by commit date and topographically. Add tooltips to note action buttons Add breadcrumb, build header and pipelines submenu to artifacts browser Update todos screenshots removes the possibility of commit messages having carriage returns Handle incoming emails from aliases correctly ...
| * \ Merge branch 'master' into ↵Grzegorz Bizon2017-05-036-0/+109
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (103 commits) Include missing project attributes to Import/Export Create the rest of the wiki docs Fill in information about creating the wiki Home page Move wiki doc to its own index page Create initial file for Wiki documentation Default to null user when asignee is unselected Re-enable ref operations with gitaly after not-found fix #31560 Add repo parameter to gitaly:install and workhorse:install Remove N+1 queries when checking nodes visible to user Don't validate reserved words if the format doesn't match Revert "Shorten and improve some job names" Remove unused initializer DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml` Make the static-analysis job be run for docs branches too Add download_snippet_path helper Refresh the markdown cache if it was `nil` Add some documentation for the new migration helpers Update comments Display comments for personal snippets Update docs on creating a project ...
| * \ \ Merge branch 'master' into ↵Grzegorz Bizon2017-05-0227-245/+655
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (314 commits) Better Explore Groups view Update Carrierwave and fog-core Add specs for Gitlab::RequestProfiler Add scripts/static-analysis to run all the static analysers in one go Shorten and improve some job names Group static-analysis jobs into a single job Don't blow up when email has no References header Update CHANGELOG.md for 9.1.2 Add changelog Add changelog Show Raw button as Download for binary files Use blob viewers for snippets Fix typo Fixed transient failure related to dropdown animations Revert "Merge branch 'tc-no-todo-service-select' into 'master'" fix link to MR 10416 Another change from .click -> .trigger('click') to make spec pass Change from .click -> .trigger('click') to make spec pass Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations Add AddColumnWithDefaultToLargeTable cop ... Conflicts: spec/requests/api/jobs_spec.rb
| * | | | Fix Rubocop offense in environments policy classGrzegorz Bizon2017-05-011-1/+1
| | | | |
| * | | | Merge branch 'master' into ↵Grzegorz Bizon2017-04-2211-93/+305
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (274 commits) Update VERSION to 9.2.0-pre Update CHANGELOG.md for 9.1.0 Update Auto Deploy documentation Disable import URL field in New project form since it's hidden by default Remove reference to burndown charts since they don't exist for ce. Use master_password for Sentinel Refactor Discussions docs Start versioning cached markdown fields Refactor add_users method for project and group Improved the spec Now correctly tests against different forms Refactor environments components into vue files - part 3 Adding animation for all dropdown fix placeholder visibility submodule_links: handle urls that don't end with .git Add help regarding vue resource and where to include it Append .json to ajax endpoint to prevent browser to display raw json Fixed the preview keyboard shortcut focusing wrong tab Fix broken link Added new discussions docs Started on resolvable discussions docs ...
| * \ \ \ \ Merge branch 'master' into ↵Grzegorz Bizon2017-04-1345-2087/+3621
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (641 commits) Revert "Fix registry for projects with uppercases in path" Fix registry for projects with uppercases in path Move event icons into events_helper Reset New branch button when issue state changes Add link to environments on kubernetes.md Indent system notes on desktop screens Improve webpack-dev-server compatibility with non-localhost setups. Add changelog entry Fix recent searches icon alignment in Safari Use preload to avoid Rails using JOIN Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error Prepare for zero downtime migrations Fix filtered search input width for IE Fix the `gitlab:gitlab_shell:check` task Fixed random failures with Poll spec Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates Let uses hide verbose output by default Separate examples for each other Collapse similar sibling scenarios Use empty_project for resources that are independent of the repo ... Conflicts: app/views/projects/ci/builds/_build.html.haml
| * | | | | | Use build policy to determine if user can play buildGrzegorz Bizon2017-04-122-52/+0
| | | | | | |
| * | | | | | Extract build play specs and extend test examplesGrzegorz Bizon2017-04-121-34/+2
| | | | | | |
| * | | | | | Take branch access into account when stopping environmentGrzegorz Bizon2017-04-061-0/+25
| | | | | | |
| * | | | | | Fix specs related to new manual actions permissionsGrzegorz Bizon2017-04-061-13/+40
| | | | | | |
| * | | | | | Check branch access when user triggers manual actionGrzegorz Bizon2017-04-061-12/+53
| | | | | | |
| * | | | | | Improve specs related to CI/CD job environmentGrzegorz Bizon2017-04-061-8/+12
| | | | | | |
* | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-062-2/+75
| | | | | | |
* | | | | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-064-8/+244
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
| * | | | | | | Reduce risk of deadlocks17361-redirect-renamed-pathsMichael Kozono2017-05-051-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We’ve seen a deadlock in CI here https://gitlab.com/mkozono/gitlab-ce/builds/15644492#down-build-trace. This commit should not fix that particular failure, but perhaps it will avoid others. * Don’t call delete_conflicting_redirects after update if the path wasn’t changed * Rename descendants without using recursion again, so we can run delete_conflicting_redirects exactly once.
| * | | | | | | Delete conflicting redirectsMichael Kozono2017-05-052-13/+111
| | | | | | | |
| * | | | | | | Create redirect routes on path changeMichael Kozono2017-05-051-1/+33
| | | | | | | |
| * | | | | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-053-4/+123
| | | | | | | |
* | | | | | | | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-056-119/+184
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵Valery Sizov2017-05-057-18/+128
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | skip]
| * | | | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-046-119/+184
| | | | | | | | |
* | | | | | | | | 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
|/ / / / / / /