summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Update tests for the fact that we would skip one linefix-trace-seeking-readlineLin Jen-Shin2017-04-131-3/+3
|
* After Trace#limit, we seek to the next line in caseLin Jen-Shin2017-04-131-1/+21
| | | | of breaking ANSI sequence or Unicode
* Revert "Fix registry for projects with uppercases in path"Grzegorz Bizon2017-04-131-19/+3
| | | | This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6.
* Fix registry for projects with uppercases in pathGrzegorz Bizon2017-04-131-3/+19
|
* Merge branch 'zero-downtime-migrations' into 'master' Douwe Maan2017-04-122-0/+429
|\ | | | | | | | | Prepare for zero downtime migrations See merge request !9976
| * Prepare for zero downtime migrationszero-downtime-migrationsYorick Peterse2017-04-122-0/+429
| | | | | | | | | | | | | | Starting with GitLab 9.1.0 we will no longer allow downtime migrations unless absolutely necessary. This commit updates the various developer guides and adds code that is necessary to make zero downtime migrations less painful.
* | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' Douwe Maan2017-04-122-4/+48
|\ \ | | | | | | | | | | | | | | | | | | removes redundant code from database.rb Closes #29056 See merge request !10583
| * | removes redundant code from database.rb29056-backport-ee-cleanup-database-fileTiago Botelho2017-04-112-4/+48
| | |
* | | Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-122-7/+19
|\ \ \ | |_|/ |/| | | | | | | | Return nil as coverage instead of a File object See merge request !10633
| * | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-122-7/+19
| |/ | | | | | | | | | | | | | | | | Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found.
* | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-121-42/+45
|\ \ | |/ |/| | | | | Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298
| * Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-42/+45
| |
* | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-111-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | Add method that returns location of registry imageGrzegorz Bizon2017-04-101-0/+7
| |/
* | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-101-48/+44
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-101-0/+30
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+102
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routesAdam Niedzielski2017-04-101-0/+83
|/ | | | | | | | | | Extract route matching logic to Gitlab::EtagCaching::Router. Fix pipeline routes: 1. "project_pipelines" has to come after "commit_pipelines" and "merge_request_pipelines" because it is more generic 2. "commit_pipelines": "\s" (any whitespace character) => "\S" (any non-whitespace character).
* 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.