summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Allowing all users to view historyAlex Kalderimis2019-07-232-0/+161
| | | | | | | | This removes the create_wiki permission check from the history controller, allowing show and history to have the same level of permissions. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29528
* Encapsulate file view modes with constantsChris Toynbee2019-07-232-6/+7
|
* Merge branch '52442-initial-mysql-support-removal' into 'master'Robert Speicher2019-07-2311-739/+225
|\ | | | | | | | | | | | | Remove dead mysql code Closes #63191 See merge request gitlab-org/gitlab-ce!29608
| * Remove dead MySQL codeNick Thomas2019-07-2311-739/+225
| | | | | | | | None of this code can be reached any more, so it can all be removed
* | Merge branch 'sh-update-mermaid' into 'master'Tim Zallmann2019-07-231-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Update Mermaid to v8.2.3 Closes #64601 See merge request gitlab-org/gitlab-ce!30985
| * | Update Mermaid to v8.2.3sh-update-mermaidStan Hu2019-07-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes fill colors not working with Mermaid and pulls in a number of other fixes. * https://github.com/knsv/mermaid/blob/master/CHANGELOG.md * https://github.com/knsv/mermaid/#special-note-regarding-version-82 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64601
* | | Merge branch 'adjust-group-level-analytics-to-accept-multiple-project-ids' ↵Stan Hu2019-07-232-1/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adjust group level analytics to accept multiple projects ids See merge request gitlab-org/gitlab-ce!30744
| * | | Add code review remarksadjust-group-level-analytics-to-accept-multiple-project-idsMałgorzata Ksionek2019-07-232-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cr remarks Improve specs according to the review Fix schema Add cr remarks Fix naming Add cr remarks
| * | | Add basic project extractionMałgorzata Ksionek2019-07-232-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow project filtering Prepare summary for accepting multiple groups Modify deploys group summary class Add filtering by project name in issues summary Fix rubocop offences Add changelog entry Change name to id in project filtering Fix rebase problem Add project extraction
* | | | Add validator for qualidied domain arrayReuben Pereira2019-07-231-0/+111
| |_|/ |/| | | | | | | | | | | - Validate that the entries contain no unicode, html tags and are not larger than 255 characters.
* | | Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'Robert Speicher2019-07-231-3/+12
|\ \ \ | | | | | | | | | | | | | | | | Mark mirrors as failed 1 hour after they started See merge request gitlab-org/gitlab-ce!30999
| * | | Mark mirrors as failed 1 hour after they startedBob Van Landuyt2019-07-231-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We call `Project#mark_stuck_remote_mirrors_as_failed!` from the `Git::BaseHooksService`. So that gets called every time we push tags or branches. Before this would only mark started mirrors as failed if they had been started 24 hours ago. A push would never take 24 hours, especially not when we run it so often. Lowering that threshold 1 hour should at least allow us to retry broken mirrors more often on pushes. The timeout for the initial push is set somewhat longer to accommodate for pushing large repos. Both numbers are currently picked arbitrarily.
* | | | CE port for Group bulk edit merge requestsEugenia Grieff2019-07-231-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bulk update sidebar to merge requests template Add js to toggle sidebar Fix bulk update button in issues template Add specs for merge requests in bulk update service
* | | | Merge branch 'safe-archiving-for-traces' into 'master'Kamil Trzciński2019-07-238-12/+154
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Extra logging for new live trace architecture See merge request gitlab-org/gitlab-ce!30892
| * | | | Validate the existence of archived traces before removing live tracesafe-archiving-for-tracesShinya Maeda2019-07-238-12/+154
| | |/ / | |/| | | | | | | | | | | | | | Often live traces are removed even though the archived trace doesn't exist. This commit checkes the existence strictly.
* | | | Merge branch 'sh-use-shared-state-cluster-pubsub' into 'master'Kamil Trzciński2019-07-232-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use persistent Redis cluster for Workhorse pub/sub notifications See merge request gitlab-org/gitlab-ce!30990
| * | | | Use persistent Redis cluster for Workhorse pub/sub notificationssh-use-shared-state-cluster-pubsubStan Hu2019-07-222-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, in Omnibus, Workhorse expected to listen via the Redis shared state cluster for the `workhorse:notifications` publish/subscribe channel, but the Rails code was using the Sidekiq queue cluster for this. To fix this inconsistency, we make the Rails code use the persistent cluster, since we don't want Workhorse to be looking at anything Sidekiq-related.
* | | | | Merge branch '57953-fix-unfolded-diff-suggestions' into 'master'Kamil Trzciński2019-07-231-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix suggestion on lines that are not part of an MR See merge request gitlab-org/gitlab-ce!30606
| * | | | Fix suggestion on lines that are not part of an MR57953-fix-unfolded-diff-suggestionsPatrick Bajao2019-07-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the `text` as plain string in the response instead of including HTML tags but keep `rich_text` as is. The fix is to modify `Blob::UnfoldPresenter#diff_files` to map each raw diff line (limited by the range specified) to a corresponding line in an array of highlighted lines to use as `rich_text`.
* | | | | Merge branch '63485-fix-pipeline-emails-to-use-group-setting' into 'master'Nick Thomas2019-07-234-38/+115
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Make pipeline emails respect group email setting Closes #63485 See merge request gitlab-org/gitlab-ce!30907
| * | | | Make pipeline emails respect group email setting63485-fix-pipeline-emails-to-use-group-settingHeinrich Lee Yu2019-07-234-38/+115
| | | | | | | | | | | | | | | | | | | | | | | | | When a user's notification email is set for a group, we should use that for pipeline emails
* | | | | Merge branch 'ce-port-315-log-impersonation-actions-in-audit-log' into 'master'Ash McKenzie2019-07-231-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Port: Log impersonation actions in audit log See merge request gitlab-org/gitlab-ce!31039
| * | | | | CE Port: Log impersonation actions in audit logce-port-315-log-impersonation-actions-in-audit-logmanojmj2019-07-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds audit logs for user impersonation when an admin starts/stops impersonating another user.
* | | | | | Merge branch 'if-64257-active_session_lookup_key_cleanup' into 'master'Bob Van Landuyt2019-07-232-1/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rake task to cleanup expired ActiveSession lookup keys See merge request gitlab-org/gitlab-ce!30668
| * | | | | | Rake task to cleanup expired ActiveSession lookup keysif-64257-active_session_lookup_key_cleanupImre Farkas2019-07-222-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases ActiveSession.cleanup was not called after authentication, so for some user ActiveSession lookup keys grew without ever cleaning up. This Rake task manually iterates over the lookup keys and removes ones without existing ActiveSession.
* | | | | | | Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'Sean McGivern2019-07-232-4/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple pipeline support for Build status See merge request gitlab-org/gitlab-ce!30828
| * | | | | | | Add specs for specifying pipeline behaviorMatija Čupić2019-07-232-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds specs for testing the new behavior of specifying a pipeline when POSTing a status.
* | | | | | | | Merge branch 'georgekoltsov/64377-add-better-log-msg-to-members-mapper' into ↵Ash McKenzie2019-07-231-0/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add better error message to MembersMapper#ensure_default_member! See merge request gitlab-org/gitlab-ce!30838
| * | | | | | | Add MembersMapper#ensure_default_user! specGeorge Koltsov2019-07-171-0/+10
| |/ / / / / /
* | | | | | | Merge branch 'rm-src-branch' into 'master'Grzegorz Bizon2019-07-231-0/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support remove source branch on merge w/ push options See merge request gitlab-org/gitlab-ce!30728
| * | | | | | | Support rm src branch on merge w/ push optionChristian Couder2019-07-171-0/+76
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `remove_source_branch` set using git push options. To create a new merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.create \ -o merge_request.remove_source_branch To update an existing merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.remove_source_branch Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | | | | Bring backward compatibility for request profilesKamil Trzciński2019-07-234-10/+104
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that we missed the backward compatibility support for profiles in the existing folder. This commit also fixes some specs to be idempotent and work in a temporary directory which not always seems to be the case. This commit also brings the profile_spec.rb which seems to be missing.
* | | | | | Merge branch 'group_with_cluster_factory' into 'master'Robert Speicher2019-07-222-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds cluster_for_group factory for convenience See merge request gitlab-org/gitlab-ce!30826
| * | | | | | Adds cluster_for_group factory for convienencegroup_with_cluster_factoryThong Kuah2019-07-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also means we don't have to resort to an update statement to set parent for child groups who also have clusters. This is much shorter than ``` create(:cluster, :provided_by_gcp, :group, groups: [group]) ```
* | | | | | | Add review remarksGosia Ksionek2019-07-221-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cr remarks Add cr remarks
* | | | | | | Merge branch 'resolve-remaining-import-export-differences' into 'master'Robert Speicher2019-07-223-2/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Resolve remaining import export differences See merge request gitlab-org/gitlab-ce!31012
| * | | | | | Backport import/export spec changes from EEresolve-remaining-import-export-differencesYorick Peterse2019-07-222-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports remaining import/export spec changes from EE to CE.
| * | | | | | Backport project.json fixture from EEYorick Peterse2019-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports all changes made to an import/export fixture file from EE to CE.
* | | | | | | Merge branch 'remove-duplicate-all-models-entry' into 'master'Robert Speicher2019-07-221-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate entry from all_models.yml See merge request gitlab-org/gitlab-ce!31010
| * | | | | | | Remove duplicate entry from all_models.ymlremove-duplicate-all-models-entryYorick Peterse2019-07-221-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This line is already present further down in the YAML file. In EE the line is already removed.
* | | | | | | Validate certificate chain only if it's changedVladimir Shushlin2019-07-222-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This validation prevents the domain from being saved from the UI e.g. when user tries to enable Let's Encrypt integration
* | | | | | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-2210-26/+249
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | | | | | Resolve some issues in MRFabio Papa2019-07-192-3/+2
| | | | | | | |
| * | | | | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-191-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | * \ \ \ \ \ \ Merge branch 'master' into 'maintainers-can-create-subgroup'Fabio Papa2019-07-12177-932/+4837
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/user/permissions.md
| | * \ \ \ \ \ \ \ Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-052-6/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | * | | | | | | | Fixed a failing testFabio Papa2019-07-051-10/+6
| | | | | | | | | | |
| | | * | | | | | | | Apply recomended changes from merge coachFabio Papa2019-07-022-8/+10
| | | | | | | | | | |
| | | * | | | | | | | Fix some code style issuesFabio Papa2019-07-022-11/+14
| | | | | | | | | | |
| | | * | | | | | | | Modify API spec to expect a maintainer to be able to create subgroupFabio Papa2019-07-021-4/+0
| | | | | | | | | | |