summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mc/feature/custom-metrics-ce' into 'master'Kamil Trzciński2019-04-162-4/+24
|\ | | | | | | | | Backport metrics report type See merge request gitlab-org/gitlab-ce!26798
| * Backport changes from EEMatija Čupić2019-04-162-4/+24
| | | | | | | | | | This backports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
* | Merge branch 'rewind-iid-on-pipelines' into 'master'Sean McGivern2019-04-161-0/+51
|\ \ | | | | | | | | | | | | | | | | | | Rewind iid on pipelines Closes #59362 See merge request gitlab-org/gitlab-ce!26490
| * | Rewind IID on Ci::Pipelinesrewind-iid-on-pipelinesKamil Trzciński2019-04-161-0/+51
| | | | | | | | | | | | | | | | | | | | | If no pipeline is created we currently have IID gap. This is due to fact that we generate IID not on save, but rather ahead of time. This results, us, losing IIDs.
* | | Don't render artifact download links on the project tags page for builds ↵drew cimino2019-04-121-7/+8
|/ / | | | | | | with expired artifacts
* | Fix grouping wiki pages by directoryIgor2019-04-121-3/+5
| | | | | | | | | | | | | | | | If a page has the same name as a directory the WikiPage#group_by_directory method can have a wrong behaviour This commit fixes it
* | Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-101-0/+2
| |
* | Fix UrlBlocker specSean McGivern2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | The newer version of HTTParty we now use will try harder to get a valid URL out of a relative one. Unfortunately, when there's no room (as was the case in this spec), the relative URL begins with `//`, which is actually a protocol-relative URL, not a simple path. Adding a room - which will always be the case in 'real life' - fixes this.
* | Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-102-0/+409
|/ | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* Revert "Merge branch 'sh-optimize-projects-api' into 'master'"revert-2cc01f12Stan Hu2019-04-101-48/+1
| | | This reverts merge request !26481
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-094-1/+124
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* Merge branch 'osw-multi-assignees-merge-requests' into 'master'Nick Thomas2019-04-096-63/+180
|\ | | | | | | | | [Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
| * [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-086-63/+180
| | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | Set release name when adding release notes to an existing tagJason Goodman2019-04-091-0/+16
|/ | | | Also set the release sha and author
* Merge branch 'instance-configuration-artifact-size' into 'master'Rémy Coutable2019-04-081-0/+7
|\ | | | | | | | | Display maximum artifact size from runtime config See merge request gitlab-org/gitlab-ce!26784
| * Display maximum artifact size from runtime configBastian Blank2019-04-031-0/+7
| | | | | | | | | | The maximum artifact size was moved into runtime config some time ago. Update the instance configuration code to read this value.
* | Add Knative metrics to PrometheusChris Baumbauer2019-04-061-0/+21
| |
* | Add part of needed codeGosia Ksionek2019-04-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-054-124/+1
| | | | | | This reverts merge request !26823
* | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-054-1/+124
| | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* | Merge branch '57493-add-limit-to-user-name' into 'master'Andreas Brandl2019-04-051-0/+5
|\ \ | | | | | | | | | | | | Add a length limit of 128 char to the user name field See merge request gitlab-org/gitlab-ce!26146
| * | Add limit of 128 characters to users name57493-add-limit-to-user-nameBrandon Labuschagne2019-04-051-0/+5
| | | | | | | | | | | | | | | Truncate existing users names which exceed 128 characters Include test for truncating users names
* | | Merge branch 'fix-merge-request-relations-with-pipeline-on-mwps' into 'master'Kamil Trzciński2019-04-051-3/+22
|\ \ \ | | | | | | | | | | | | | | | | Fix MWPS doesn't work for merge request pipelines See merge request gitlab-org/gitlab-ce!26906
| * | | Fix merge requst relationships with pipeline in MWPSServicefix-merge-request-relations-with-pipeline-on-mwpsShinya Maeda2019-04-051-3/+22
| |/ / | | | | | | | | | | | | | | | MWPSService currently uses the old pipeline lookup method. It searches related merge requests with pipeline.ref, however, this doesn't work for attached/detached merge request pipelines.
* | | Autocorrect with RSpec/ExampleWording copThong Kuah2019-04-0527-124/+124
| | | | | | | | | | | | | | | | | | | | | - rewords examples starting with 'should' - rewords examples starting with 'it' Note: I had to manually fixup "onlies" to "only"
* | | Merge branch '59162-fix-review-apps-initial-seeding' into 'master'Dmitriy Zaporozhets2019-04-051-5/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix race condition in ApplicationSettingImplementation.create_from_defaults Closes #59162 See merge request gitlab-org/gitlab-ce!26319
| * | Fix race cond. in ApplicationSettingImplementation.create_from_defaults59162-fix-review-apps-initial-seedingRémy Coutable2019-04-041-5/+4
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'drop-usage-of-leagcy-artifacts' into 'master'Kamil Trzciński2019-04-041-0/+18
|\ \ \ | | | | | | | | | | | | | | | | Drop legacy artifacts usage as there are no leftovers See merge request gitlab-org/gitlab-ce!24294
| * | | Drop legacy artifacts usagedrop-usage-of-leagcy-artifactsShinya Maeda2019-04-041-0/+18
| | |/ | |/| | | | | | | | | | | | | Legacy artifacts have been correctly migrated to new place - ci_job_artifacts. Now it's time to remove the related code, but before that we should ensure it doesn't break anything by using feature flag.
* | | Renamed terminal_specification to channel_specificationFrancisco Javier López2019-04-041-4/+12
| | | | | | | | | | | | | | | | | | We're moving from using terminology related to terminals when we refer to Websockets connections in Workhorse. It's more appropiate a concept like channel.
* | | Allow reactive caching to be used in servicesReuben Pereira2019-04-041-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | Add support for defining a reactive_cache_worker_finder function that will be used by the reactive_caching_worker to generate/initialize the calling object. This allows reactive caching to work with Services where the object cannot be obtained from DB but a new object can be initialized.
* | | Allow to sort wiki pages by date and titleIgor2019-04-041-14/+31
| | | | | | | | | | | | | | | - Add controls for sorting by title and date - Execute Gitaly call which now accepts sorting params for wikis
* | | Add cr remarksGosia Ksionek2019-04-041-0/+26
| | | | | | | | | | | | | | | | | | Chnage method used in model to make it more efficient database-wise Add additional spec
* | | Fixed test specsOswaldo Ferreira2019-04-041-0/+16
| |/ |/| | | | | | | - added suggestions to mock data - fixed props to be not required
* | Merge branch 'support-time-windows-api' into 'master'James Lopez2019-04-042-4/+61
|\ \ | |/ |/| | | | | Support time window parameters in additional metrics endpoint See merge request gitlab-org/gitlab-ce!26228
| * Specify time window for additional metrics apisupport-time-windows-apisyasonik2019-04-032-4/+61
| | | | | | | | | | | | | | | | | | Adds support for start and end parameters in the #additional_metrics endpoint of the EnvironmentsController. start and end are meant to be unix timestamps, per the Prometheus API (as the consumer of this endpoint will eventually be transitioned to a prometheus endpoint). This functionality is behind the :metrics_time_window feature flag for development.
* | Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'Rémy Coutable2019-04-031-0/+8
|\ \ | |/ |/| | | | | | | | | Do not show system notes on commits in the MR page Closes #55268 See merge request gitlab-org/gitlab-ce!26396
| * Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mrHeinrich Lee Yu2019-04-021-0/+8
| |
* | Merge branch 'ce-reduce-diff-in-spec-models' into 'master'Lin Jen-Shin2019-04-025-7/+42
|\ \ | |/ |/| | | | | [CE] Reduce diff with EE in `spec/models` See merge request gitlab-org/gitlab-ce!26847
| * [CE] Reduce diff with EE in spec/models/project_wiki_spec.rbce-reduce-diff-in-spec-modelsRémy Coutable2019-04-021-1/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/project_team_spec.rbRémy Coutable2019-04-021-0/+24
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/project_spec.rbRémy Coutable2019-04-021-0/+9
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/environment_spec.rbRémy Coutable2019-04-021-1/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/concerns/prometheus_adapter_spec.rbRémy Coutable2019-04-021-5/+6
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Stop calling UnlinkRepositoryFromObjectPool RPCJacob Vosmaer2019-04-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59777. In earlier iterations of our implementation of Git object deduplication we thought we would be making extensive use of Git remotes in pool repositories in the future, and that we should manage these remotes carefully from the start. We now expect we only care about one remote, namely the source project. The other remotes are there only for forensic purposes. Before this MR we tried to also remove pool remotes when member projects got deleted, with the UnlinkRepositoryFromObjectPool RPC. This is fragile when there are race conditions (see https://gitlab.com/gitlab-org/gitaly/issues/1568#note_153955926). We have spent some time making this RPC less fragile in https://gitlab.com/gitlab-org/gitaly/merge_requests/1151 but looking at this problem again, I think we should just stop calling it.
* | Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'Kamil Trzciński2019-04-021-42/+0
|\ \ | | | | | | | | | | | | Backport: Expose merge request pipeline parameters for MR widget See merge request gitlab-org/gitlab-ce!26826
| * | Backport EE changeexpose-mr-pipeline-parameters-for-merge-widget-ceShinya Maeda2019-04-021-42/+0
| |/ | | | | | | This is for merge request pipelines
* | Backport splitting approval changes from CEIgor2019-04-022-28/+13
| | | | | | | | | | | | | | Author and committers approvals are split in EE This commit provides backports for those changes This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
* | Merge branch 'issue_51789_part_1' into 'master'Sean McGivern2019-04-021-0/+30
|\ \ | |/ |/| | | | | | | | | Migrate issuable states to integer patch 1 of 2 Closes #51789 See merge request gitlab-org/gitlab-ce!25107
| * Merge masterFelipe Artur2019-03-2759-920/+2547
| |\
View Lorry Controller Status