summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Backport of EE changes in environments tests1595-ee-backport-environments-testsFilipa Lacerda2017-04-072-4/+6
|
* Merge branch '24240-prometheus_healthz' into 'master' Douwe Maan2017-04-0717-20/+662
|\ | | | | | | | | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track application readiness Closes #24240 See merge request !10416
| * Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵Paweł Chojnacki2017-04-0717-20/+662
|/ | | | application readiness
* Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil Trzciński2017-04-0735-160/+550
|\ | | | | | | | | Add auto-cancel for pending pipelines on branch, if they are not HEAD See merge request !9362
| * Fix bad conflict resolutionLin Jen-Shin2017-04-071-6/+5
| |
| * Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-07208-1080/+2267
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07246-1551/+6072
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | Make sure that's canceledLin Jen-Shin2017-04-071-1/+1
| | | |
| * | | Fix test by ignoring auto_canceled_by for jobsLin Jen-Shin2017-04-071-3/+4
| | | |
| * | | Fix typoLin Jen-Shin2017-04-071-1/+1
| | | |
| * | | Fix rubocop offenses8998_skip_pending_commits_if_not_headLin Jen-Shin2017-04-062-2/+2
| | | |
| * | | Bump schema versionLin Jen-Shin2017-04-061-1/+1
| | | |
| * | | Use before_transitionLin Jen-Shin2017-04-061-4/+4
| | | |
| * | | Add missing tests and update test descriptionLin Jen-Shin2017-04-063-1/+3
| | | |
| * | | We don't have to save, transition would save for usLin Jen-Shin2017-04-061-1/+1
| | | |
| * | | Also track auto-cancelling in jobs, detail:Lin Jen-Shin2017-04-0614-27/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06147-214/+1525
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix a view test by using presenterLin Jen-Shin2017-04-061-1/+1
| | | | |
| * | | | Fix rolling back for MySQLLin Jen-Shin2017-04-064-57/+2
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-06206-891/+54440
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | Add a test to make sure it's not auto-cancelingLin Jen-Shin2017-04-061-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | whenever the feature is disabled in the project.
| * | | | | Add test for presentersLin Jen-Shin2017-04-064-4/+90
| | | | | |
| * | | | | Add tests for relations and scopes, and settingLin Jen-Shin2017-04-063-0/+25
| | | | | |
| * | | | | Restore schemaLin Jen-Shin2017-04-051-6/+6
| | | | | |
| * | | | | Remove tooltip from API and vue, follow up:Lin Jen-Shin2017-04-062-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/30511
| * | | | | Fix test and only show job status title if it'sLin Jen-Shin2017-04-054-41/+54
| | | | | | | | | | | | | | | | | | | | | | | | cancelled and the pipeline is auto-cancelled.
| * | | | | replaced one more helper with presenterRydkin Maxim2017-04-042-2/+2
| | | | | |
| * | | | | extract build.pipeline as variableRydkin Maxim2017-04-041-5/+6
| | | | | |
| * | | | | replace helper with decoratorRydkin Maxim2017-04-044-10/+9
| | | | | |
| * | | | | split up migrationsRydkin Maxim2017-04-042-15/+42
| | | | | |
| * | | | | rename pipeline_presenterRydkin Maxim2017-04-043-3/+3
| | | | | |
| * | | | | remove unnecessary spaceRydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | remove redundant `pipeline`Rydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | fix migration errorRydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | add presenter for status badgeRydkin Maxim2017-04-043-2/+15
| | | | | |
| * | | | | replace on_delete in migration with database type related expressionRydkin Maxim2017-04-041-1/+8
| | | | | |
| * | | | | refactor specRydkin Maxim2017-04-041-10/+7
| | | | | |
| * | | | | remove `a pending pipeline` shared exampleRydkin Maxim2017-04-041-7/+3
| | | | | |
| * | | | | fix linter errorRydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | add tooltip on badge in pipelines indexRydkin Maxim2017-04-042-1/+11
| | | | | |
| * | | | | adds tooltips into several placesRydkin Maxim2017-04-045-7/+12
| | | | | |
| * | | | | fix fallen import_export specRydkin Maxim2017-04-041-0/+2
| | | | | |
| * | | | | fix rubocopRydkin Maxim2017-04-041-5/+5
| | | | | |
| * | | | | fix on_deleteRydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | add auto_canceled_by_id to safe_model_attributes.ymlRydkin Maxim2017-04-041-0/+1
| | | | | |
| * | | | | rename `auto_canceled_by` and add foreign keyRydkin Maxim2017-04-045-19/+28
| | | | | |
| * | | | | more brief way of get parent commitRydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | change order of enum options in auto_cancel_pending_pipelinesRydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | fix typoRydkin Maxim2017-04-041-1/+1
| | | | | |
| * | | | | move `auto_cancelable_pipelines` method to `create_pipeline_service.rb`Rydkin Maxim2017-04-042-10/+9
| | | | | |
View Lorry Controller Status