summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Fix caching of future broadcast messagesfix-broadcast-message-cachingYorick Peterse2017-08-211-5/+27
| | | | | | | | | 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-211-0/+10
|\ | | | | | | | | | | | | 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-211-0/+10
| |
* | Merge branch 'backstage/gb/migrate-stages-statuses' into 'master'Kamil Trzciński2017-08-213-6/+64
|\ \ | | | | | | | | | | | | | | | | | | Migrate CI/CD stages statuses Closes #33453 See merge request !12584
| * | Use usual method to retrieve CI/CD stage statusesGrzegorz Bizon2017-08-161-2/+2
| | |
| * | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-08-1647-433/+1120
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-311-2/+0
| | | |
| * | | Merge commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3' into ↵Grzegorz Bizon2017-07-3118-29/+225
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2611-39/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-261-1/+1
| | | | | |
| * | | | | Move enum specific code from a concern to CI stageGrzegorz Bizon2017-07-262-5/+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-241-11/+4
| | | | | |
| * | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-245-23/+43
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | Implement method that updates a stage statusGrzegorz Bizon2017-07-201-0/+47
| | | | | | |
| * | | | | | Change a method name which enumerates CI/CD statusesGrzegorz Bizon2017-07-202-2/+2
| | | | | | |
| * | | | | | Implement proper associations with a persisted stageGrzegorz Bizon2017-07-201-2/+2
| | | | | | |
| * | | | | | Use a new stage_id reference to a persisted stageGrzegorz Bizon2017-07-201-3/+1
| | | | | | |
| * | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2015-85/+91
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | Freeze mutable constants in stages migration codeGrzegorz Bizon2017-07-111-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-1066-329/+786
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | Add a workaround for a tmp job -> stage relationGrzegorz Bizon2017-07-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still didn't migrate `ci_builds.stage_id`, so we can't use a belongs_to association. We also have `ci_builds.stage` string attribute, that we need to phase out in favor of `ci_stages.name`.
| * | | | | | | | Add some validations to persisted stage modelGrzegorz Bizon2017-07-042-8/+9
| | | | | | | | |
| * | | | | | | | Use enumerated status in persisted stage classGrzegorz Bizon2017-07-042-0/+13
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/sm/34805-get-back-validates-uniqueness-1' into 'master'Kamil Trzciński2017-08-212-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `validates :key, uniqueness: { scope: :pipeline_schedule_id }` in `Ci::PipelineScheduleVariable` model See merge request !13641
| * | | | | | | | | Add validate: false. Add validates uniqueness.fix/sm/34805-get-back-validates-uniqueness-1Shinya Maeda2017-08-182-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'issue_20900_remove_ignore_columns' into 'master'Sean McGivern2017-08-212-4/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 20900 remove ignore columns See merge request !12166
| * | | | | | | | | | Remove ignore columnsFelipe Artur2017-08-182-4/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mk-fix-user-namespace-rename' into 'master'Douwe Maan2017-08-211-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make username update fail if namespace update fails Closes gitlab-com/support-forum#2316 See merge request !13642
| * | | | | | | | | Add namespace errors from User#after_updatemk-fix-user-namespace-renameMichael Kozono2017-08-181-1/+6
| | | | | | | | | |
| * | | | | | | | | Make username update fail if namespace part failsMichael Kozono2017-08-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '36611-error-in-getcomposer-link' into 'master'🏖 Rémy Coutable 🏖2017-08-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix external link to Composer website Closes #36611 See merge request !13621
| * | | | | | | | | Fix external link to Composer websiteMark Fletcher2017-08-171-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-171-6/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627
| * | | | | | | | | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ceTiago Botelho2017-08-171-6/+19
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | | | | | | | | Merge branch '35072-fix-pages-delete' into 'master'Sean McGivern2017-08-171-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deleting of a GitLab Pages project results in "`PagesWorker.perform_in` cannot be called inside a transaction"" Closes #35072 See merge request !13631
| * | | | | | | | | Run remove_pages in a run_after_commit blockNick Thomas2017-08-171-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove a wat in NamespacelessProjectDestroyWorkerNick Thomas2017-08-171-0/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | expose Referable#non_referable_inspectdev.non-referable-inspecthttp://jneen.net/2017-08-162-9/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-162-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only create commit GPG signature when necessary See merge request !13561
| * | | | | | | | Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-162-1/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-1613-21/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
| * | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-1413-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* | | | | | | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-163-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
| * | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-153-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '34643-fix-project-path-slugify' into 'master'Rémy Coutable2017-08-162-5/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI_PROJECT_PATH_SLUG slugify Closes #34643 See merge request !13350
| * | | | | | | | Fix CI_PROJECT_PATH_SLUG slugifyvanadium232017-08-152-5/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-151-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the number of forks of a project See merge request !13535
| * | | | | | | | | Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-141-1/+4
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The number of forks of a project doesn't change very frequently and running a COUNT(*) every time this information is requested can be quite expensive. We also end up running such a COUNT(*) query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* | | | | | | | | Merge branch '34533-speed-up-group-project-authorizations' into 'master'Douwe Maan2017-08-153-8/+51
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
View Lorry Controller Status