summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-42/+45
|
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-077-113/+222
|\
| * Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-077-113/+222
| |\ | | | | | | | | | | | | | | | | | | Add indication for closed or merged issuables in GFM Closes #1369 See merge request !9462
| | * Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-077-113/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: for issues that are closed, the links will now show '[closed]' following the issue number. This is done as post-process after the markdown has been loaded from the cache as the status of the issue may change between the cache being populated and the content being displayed. In order to avoid N+1 queries problem when rendering notes ObjectRenderer populates the cache of referenced issuables for all notes at once, before the post processing phase. As a part of this change, the Banzai BaseParser#grouped_objects_for_nodes method has been refactored to return a Hash utilising the node itself as the key, since this was a common pattern of usage for this method.
* | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-077-23/+359
|\ \ \ | |/ /
| * | Merge branch ↵Sean McGivern2017-04-071-0/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master' Add "engineering" UI for Pipeline Schedule See merge request !10533
| | * Add ref and active to import/export configSean McGivern2017-04-071-0/+2
| | |
| * | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-071-0/+190
| |\ \ | | | | | | | | | | | | | | | | Fix invalidating Project build status cache to often See merge request !10313
| | * | Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-071-8/+11
| | | |
| | * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-071-1/+1
| | | |
| | * | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-0/+14
| | | |
| | * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-071-0/+173
| | |/
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-076-23/+167
| |\ \ | | |/ | |/| | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0614-239/+1027
| | |\ | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-064-9/+64
| | |\ \
| | * \ \ Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0656-146/+686
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| | * | | | Added ProtectedTag to import/export son and safe_model_attributesJames Edwards-Jones2017-04-043-0/+36
| | | | | |
| | * | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-043-3/+4
| | | | | |
| | * | | | Cleaned up duplication with ProtectedRefAccess concernJames Edwards-Jones2017-04-041-1/+0
| | | | | |
| | * | | | Attempt to fix import/export of push_access_levels for protected tagsJames Edwards-Jones2017-04-041-0/+5
| | | | | |
| | * | | | Cleanup & tests for UserAccess#can_create_tag?James Edwards-Jones2017-04-041-0/+70
| | | | | |
| | * | | | Protected Tags prevents all updates instead of just force pushes.James Edwards-Jones2017-04-041-45/+38
| | | | | | | | | | | | | | | | | | This only changes behaviour for masters, as developers are already prevented from updating/deleting tags without the Protected Tags feature
| | * | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-031-1/+1
| | | | | |
| | * | | | Protected Tags enforced over gitJames Edwards-Jones2017-03-311-1/+41
| | | | | |
* | | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-077-3/+208
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use Gitlab::Git::Repository#gitaly_... moreJacob Vosmaer2017-04-072-2/+2
| | | | | |
| * | | | | Send more Gitaly::Repository fieldsJacob Vosmaer2017-04-071-1/+1
| | | | | |
| * | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵Paweł Chojnacki2017-04-074-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | application readiness
* | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-0/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil Trzciński2017-04-072-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auto-cancel for pending pipelines on branch, if they are not HEAD See merge request !9362
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-073-0/+78
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8998_skip_pending_commits_if_not_head * upstream/master: (58 commits) Fix icon name error Rewrite system note helper Change edit icon Leave icon area blank if legacy note; remove diamond icon Fix positioning of note icons Fix newline errors Add remaining system note icons Add system notes icon helper; add icons Fixed specs Updated JS that was causing the hints to appear & then disappear Update tests Fix broken spinach test Reuse code Improve shortcuts code Adds ShortcutsDashboardNavigation to globals comment since its a global variable Fix shortcut specs Reorganize shortcut help menu Change todos shortcut to shift Change shortcuts Switch global shortcuts to shift; reuse key styles from help menu Map bindings to lowercase letters; only show key bindings when using keyboard shortcut ...
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-0713-247/+963
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8998_skip_pending_commits_if_not_head * upstream/master: (197 commits) Add text to break up diagrams Implement review comments from @DouweM for !10467. Fix rubocop offence Linking to edit file directly Optimise trace handling code to use streaming instead of full read Use config.toml to configure Gitaly Fix indexes in container repositories table Recent search history for issues Fix rubocop Use change direction in spec Use be_pending Improve trigger_schedule.rb Implement a offset calculation on cron_parser_spec Clean up trigger_schedule_worker_spec.rb Improve instantiate recursion in cron_parser.rb Fix unnecessary changes in schema.rb Add empty line in cron_parser.rb Use parenthesis for respond_to :ref Define next_time as let in trigger_schedule_spec Remove next_run_at: nil from trigger_schedule_spec ...
| | * | | | | | | Also track auto-cancelling in jobs, detail:Lin Jen-Shin2017-04-062-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not only tracking auto-cancelling in pipelines, we'll also track this in jobs because pipelines could be retried and the information would get lost when this happened. Also erase auto-cancelling relation for pipelines when they're retried.
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-063-1/+56
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8998_skip_pending_commits_if_not_head * upstream/master: Show CI status as Favicon on Pipelines, Job and MR pages STL file viewer Wait for the PDF to be loaded before doing anything remove unnecessary lease as cron job Search for opened MRs - include reopened MRs ProjectsFinder should handle more options Clearly show who triggered the pipeline in email Make it possible to preview pipeline success/failed emails Add remove_concurrent_index to database helper fix project authorizations migration issue attempt to fix migration Revert schema.rb attempt to fix db failure Periodically mark projects that are stuck in importing as failed Fix html structure to prevent tooltip from not hidding Enable creation of deploy keys with write access via the API
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-0622-53/+198
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8998_skip_pending_commits_if_not_head * upstream/master: (64 commits) Merge branch 'open-redirect-fix-continue-to' into 'security' Merge branch 'open-redirect-host-fix' into 'security' Merge branch 'path-disclosure-proj-import-export' into 'security' Merge branch '29364-private-projects-mr-fix' Merge branch '30125-markdown-security' Issue title realtime Update CHANGELOG.md for 8.16.9 Update CHANGELOG.md for 8.17.5 Update CHANGELOG.md for 9.0.4 Add "search" optional param and docs for V4 Use PDFLab to render PDFs in GitLab Separate Scala from Java in CI examples Fix broken link Reorganize CI examples, add more links Refactor CI index page Remove deprecated field from workhorse response Use gitlab-workhorse 1.4.3 Document how ETag caching middleware handles query parameters Make group skip validation in the frontend Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware ...
| | * | | | | | | | fix fallen import_export specRydkin Maxim2017-04-041-0/+2
| | | | | | | | | |
| | * | | | | | | | add auto_canceled_by_id to safe_model_attributes.ymlRydkin Maxim2017-04-041-0/+1
| | | | | | | | | |
| * | | | | | | | | In case of Etag cache hit, the body should be emptyToon Claes2017-04-061-0/+6
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'optimise-pipelines' into 'master' Douwe Maan2017-04-061-0/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Optimise pipelines.json See merge request !10462
| | * | | | | | | Merge remote-tracking branch 'origin/master' into optimise-pipelinesoptimise-pipelinesKamil Trzcinski2017-04-0637-301/+1218
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Fix import exportKamil Trzcinski2017-04-061-0/+5
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0615-247/+1035
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| * | | | | | | Merge branch 'microsoft-teams-integration' into 'master' Douwe Maan2017-04-063-0/+72
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | adds initial microsoft teams integration See merge request !10412
| | * | | | | | adds relevant testsTiago Botelho2017-04-062-0/+71
| | | | | | | |
| | * | | | | | adds initial microsoft teams integrationTiago Botelho2017-04-051-0/+1
| | | | | | | |
| * | | | | | | Merge branch ↵Kamil Trzciński2017-04-063-0/+131
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation' into 'master' Resolve "Run CI/CD pipelines on a schedule" - "Basic backend implementation" See merge request !10133
| | * | | | | | | Implement a offset calculation on cron_parser_specShinya Maeda2017-04-061-1/+1
| | | | | | | | |
| | * | | | | | | Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.Shinya Maeda2017-04-062-15/+15
| | | | | | | | |
| | * | | | | | | Separate cron_valid? and cron_time_zone_valid?Shinya Maeda2017-04-061-13/+25
| | | | | | | | |
| | * | | | | | | Dry up next_time_from. Move cron_parser_spec to appropriate location.Shinya Maeda2017-04-062-106/+104
| | | | | | | | |