summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix caching of future broadcast messagesfix-broadcast-message-cachingYorick Peterse2017-08-213-5/+55
| | | | | | | | | This changes the caching mechanism so we cache both current _and_ future broadcast messages, then manually filter out those we don't want to display. This ensures we don't need any additional queries while still being able to display the right messages at the right time. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36661
* Merge branch 'sh-fix-atom-feeds' into 'master'Sean McGivern2017-08-212-0/+16
|\ | | | | | | | | | | | | Fix 500 errors in Atom feeds due to push events Closes #36705 See merge request !13695
| * Fix Error 500s when viewing user or group Atom feedsStan Hu2017-08-212-0/+16
| |
* | Merge branch 'winh-projects-select-dropdown' into 'master'Clement Ho2017-08-213-2/+40
|\ \ | | | | | | | | | | | | Make project selection dropdown consistent See merge request !13562
| * | Make project selection dropdown consistentwinh-projects-select-dropdownwinh2017-08-203-2/+40
| |/
* | Make RuboCop happySean McGivern2017-08-211-1/+1
| |
* | Merge branch 'fix/gb/fix-head-pipeline-when-pipeline-has-errors' into 'master'Kamil Trzciński2017-08-213-15/+59
|\ \ | | | | | | | | | | | | | | | | | | Fix merge request head pipeline when pipeline has errors Closes #36657 See merge request !13664
| * | Add a changelog entry for merge request pipeline fixfix/gb/fix-head-pipeline-when-pipeline-has-errorsGrzegorz Bizon2017-08-191-0/+5
| | |
| * | Update merge request pipeline even if if has errorsGrzegorz Bizon2017-08-182-4/+27
| | |
| * | Make create pipeline service specs more readableGrzegorz Bizon2017-08-181-11/+27
| | |
* | | Merge branch 'backstage/gb/migrate-stages-statuses' into 'master'Kamil Trzciński2017-08-2118-22/+478
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate CI/CD stages statuses Closes #33453 See merge request !12584
| * | | Add specs for stage status background migration classGrzegorz Bizon2017-08-171-0/+80
| | | |
| * | | Merge branch 'backstage/gb/migrations-tests-schema-version' into ↵Grzegorz Bizon2017-08-175-28/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/migrate-stages-statuses * backstage/gb/migrations-tests-schema-version: Migrate down before each migration unit test Disable db_cleaner tables caching in migrations tests Extend migrations testing documentation Make it possible to provide schema version in tests Migrate db schema for context in :migration specs
| * | | | Use usual method to retrieve CI/CD stage statusesGrzegorz Bizon2017-08-164-6/+6
| | | | |
| * | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-08-161948-20363/+31593
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1000 commits) Fix username autocomplete group name with no avatar alignment Fix 'Projected tags' typo in protected_tags_spec.rb Many Repo Fixes Repo Editor Fixes Docs: New index for permissions link article from CI index link tech articles from the landing page new articles come first fix relative link fix date format Fixed changed files dropdown not being shown Update publication date Remove deprecated field from workhorse API responses Fix API responses when dealing with txt files Make sure MySQL would not use CURRENT_TIMESTAMP Add two more project templates Allow usage of any_projects? with an Array Copyedit Artifactory and GitLab article Rename Artifactory and GitLab article file Display GPG status loading spinner only when Ajax request is made ...
| * | | | | Use update_column_in_batches helper in stages migrationGrzegorz Bizon2017-07-312-5/+1
| | | | | |
| * | | | | Add specs for stage update workerGrzegorz Bizon2017-07-311-0/+22
| | | | | |
| * | | | | Merge commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3' into ↵Grzegorz Bizon2017-07-311205-3419/+7563
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/migrate-stages-statuses * commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3': (270 commits) Add a note about EFS and GitLab log files Projects logo are not centered vertically on projects page Fix spec/features/projects/branches_spec Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id Fix a spec that was assuming to be on the wrong page Add copy about search terms to ux guide Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation' Fix replying to commit comments on MRs from forks Fix 500 error when rendering avatar for deleted project creator Load and process at most 100 commits when pushing into default branch Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Add log messages to clarify log messages about API CSRF token verification failure Update gitlab_flow.md, Teatro seems to be completely dead, see also https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774 Fix diff commenting results just after changing view Update CHANGELOG.md for 9.4.2 none is not a CSS Value for sizes ;-) Merge issuable "reopened" state into "opened" Make access level more compatible with EE Add link to JIRA article in docs Expand pipeline_trigger_service_spec by godfat request ...
| * \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-26267-1024/+4051
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (110 commits) Add missing colon Fix project wiki web_url spec Resolve "Memory usage notice doesn't link anywhere" Docs new topic "user/index" Implement GRPC call to RepositoryService Pending delete projects should not show in deploy keys Remove outdated ~Frontend label in CONTRIBUTING.md Fixes 500 error caused by pending delete projects in admin dashboard Add lower path index to redirect_routes Remove project_key from the Jira configuration Update CHANGELOG.md for 9.4.1 Enable gitaly_post_upload_pack by default Add `api` prefix as a top level route in the spec. Move relative_path to the element that is being clicked Bumps Gitlab Omniauth LDAP version Add directives to Vue component ordering synchronize ukrainian translation in zanata again v3 API is unsupported after 9.5, but may not be removed Fix vertical alignment in firefox and safari for pipeline mini graph Adds link_to_gfm method instrumentation ... Conflicts: db/schema.rb
| * | | | | | | Rename method responsible for updating stage statusGrzegorz Bizon2017-07-263-6/+8
| | | | | | | |
| * | | | | | | Move enum specific code from a concern to CI stageGrzegorz Bizon2017-07-262-5/+1
| | | | | | | |
| * | | | | | | Fix import/export for CI/CD stage commit statusesGrzegorz Bizon2017-07-241-1/+1
| | | | | | | |
| * | | | | | | Update related stage status when job status is changedGrzegorz Bizon2017-07-242-0/+3
| | | | | | | |
| * | | | | | | Do not implement CI/CD job to stage association yetGrzegorz Bizon2017-07-243-24/+5
| | | | | | | |
| * | | | | | | Adds some specs for stage optimistic lockingGrzegorz Bizon2017-07-243-1/+21
| | | | | | | |
| * | | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-24372-1537/+3665
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (97 commits) Bulk update sidebar UI polish Fix margin in mini graph for commits box Add space between words in language dropdown Fix support for old CI API when image or services are not specified Short-circuit build coverage extraction for empty regexes Update VERSION to 9.5.0-pre Update CHANGELOG.md for 9.4.0 Compress gitlab svg logo Fix the gcovr coverage regex by removing line separators before scanning Capitalize Sidekiq word in dev doc Add 1px to breadcrumbs min height Update nginx docs Use custom font SVG for logo Port spinach tests to rspec feature specs Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3' Copy-edit background migrations guidelines Add Traditional Chinese in Taiwan translations of Pipeline Schedules Fix new project selectors in GitLab QA Reword success to passing for pipeline badges Rename build to pipeline for status badges ...
| * | | | | | | | Add simple asynchronous stage update workerGrzegorz Bizon2017-07-201-0/+8
| | | | | | | | |
| * | | | | | | | Implement method that updates a stage statusGrzegorz Bizon2017-07-202-2/+67
| | | | | | | | |
| * | | | | | | | Add optimistic locking column to ci_stages tableGrzegorz Bizon2017-07-202-1/+11
| | | | | | | | |
| * | | | | | | | Change a method name which enumerates CI/CD statusesGrzegorz Bizon2017-07-202-2/+2
| | | | | | | | |
| * | | | | | | | Implement proper associations with a persisted stageGrzegorz Bizon2017-07-202-2/+23
| | | | | | | | |
| * | | | | | | | Use a new stage_id reference to a persisted stageGrzegorz Bizon2017-07-202-6/+5
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2014-47/+220
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix background migration cleanup specs Fix JS; make buttons sr accessibile; fix overlay Isolate stage_id reference clean up migration Fix eslint Make sidebar accessible on mobile Add mobile navigation on project page Fix database schema version number Fix background migrations module specs Remove migration dependency from stage_id migration Remove obsolete argument from bg migrations code Add specs for stage_id reference cleanup migration Add pending set of specs for stage_id cleanup migration Rename stage_id reference clean up migration Implement build stage_id reference migration clean up
| * \ \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-20766-4592/+14540
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (319 commits) remove redundant changelog entries Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' Merge branch '33303-404-for-unauthorized-project' into 'security-9-3' Merge branch '33359-pers-snippet-files-location' into 'security-9-3' Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' Hide description about protected branches to non-member Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8 Respect blockquote line breaks in markdown 35209 Add wip message to new navigation preference section Add github imported projects count to usage data Add versions to Prometheus metrics doc Add Bulgarian translations of Pipeline Schedules Add Esperanto translations of Pipeline Schedules Add Traditional Chinese in HongKong translations of Pipeline Schedules Add Simplified Chinese translations of Pipeline Schedules Resolve "Clarify k8s service keys" ... Conflicts: db/schema.rb
| * | | | | | | | | | Update version number of stages statuses migrationGrzegorz Bizon2017-07-114-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix pipeline stages statuses migration specsGrzegorz Bizon2017-07-111-5/+3
| | | | | | | | | | |
| * | | | | | | | | | Freeze mutable constants in stages migration codeGrzegorz Bizon2017-07-114-6/+4
| | | | | | | | | | |
| * | | | | | | | | | Add a new stage status column to safe attributesGrzegorz Bizon2017-07-111-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Schedule stages statuses bg migrations in batchesGrzegorz Bizon2017-07-103-12/+16
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-101433-7558/+17195
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (587 commits) Increase GitLab QA screenshots size Fix QA test scenario for creating a new project Configure headless chrome screenshots correctly Allow passing exceptions when creating project services Also inject new route helpers into includers of GitlabRoutingHelper Remove many N+1 queries with merge requests API fix milestones finder failing spec Make wrong migrations idempotent Remove double border on last group row Update tests to test what the component renders and what the clicks calls Username and password are no longer stripped from import url on import Change `sign_out` usage to `gitlab_sign_out` in one spec Send Gitaly Repository with /api/internal/allowed Resolve "Liberation Mono weird font rendering on Fedora/openSUSE/other Linux distros" Force mobile view for admin projects fix spec Mark a subgroup-related spec as PostgreSQL-only Use vue .prevent to prevent the click Add members-list class to admin projects page Fix another typo in SHA attribute spec ... Conflicts: db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb db/schema.rb lib/gitlab/background_migration/migrate_build_stage_id_reference.rb spec/migrations/migrate_stage_id_reference_in_background_spec.rb
| * | | | | | | | | | | Move stages status migration to the background workerbackstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-055-79/+122
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into ↵Grzegorz Bizon2017-07-057-7/+185
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/migrate-stages-statuses * fix/gb/stage-id-reference-background-migration: (22 commits) Reduce a delay between stage_id scheduled migrations Improve exception description in bg migrations Do not override original AR5 batching interface Sanitize id value passed to async background migration Improve code examples in background migrations docs Add description to exception in bg migrations worker Do not compare float with integer in migrations specs Improve readability of build stage id migration query Use integers to schedule delayed background migrations Test if argument passed to a migration is present Make `inline` a default sidekiq testing processing again Improve specs for background stage_id ref migration Perform stage_id ref backgound migration in bulks Remove unused background migrations matcher Use ActiveRecord 5 batching to schedule bg migration Make it possible to schedule bg migrations in bulk Add specs for delayed stage_id background migrations Schedule background migration only when it is needed Find builds that require a migration in batches Update `db/schema.rb` with a new schema version ...
| | * | | | | | | | | | | Reduce a delay between stage_id scheduled migrationsGrzegorz Bizon2017-07-032-5/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Improve exception description in bg migrationsGrzegorz Bizon2017-07-031-1/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Do not override original AR5 batching interfaceGrzegorz Bizon2017-06-302-4/+7
| | | | | | | | | | | | |
| | * | | | | | | | | | | Sanitize id value passed to async background migrationGrzegorz Bizon2017-06-301-3/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Improve code examples in background migrations docsGrzegorz Bizon2017-06-301-4/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add description to exception in bg migrations workerGrzegorz Bizon2017-06-301-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Do not compare float with integer in migrations specsGrzegorz Bizon2017-06-291-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Improve readability of build stage id migration queryGrzegorz Bizon2017-06-292-8/+9
| | | | | | | | | | | | |