summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Review App debugging64996-fix-review-app-debuggingRémy Coutable2019-07-231-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'Robert Speicher2019-07-233-5/+19
|\ | | | | | | | | 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-233-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch '12719-group-bulk-edit-merge-requests-change-milestone-ce' into ↵Robert Speicher2019-07-237-31/+57
|\ \ | | | | | | | | | | | | | | | | | | 'master' CE port for Group bulk edit merge requests See merge request gitlab-org/gitlab-ce!30569
| * | CE port for Group bulk edit merge requestsEugenia Grieff2019-07-237-31/+57
|/ / | | | | | | | | | | | | 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-2316-20/+214
|\ \ | | | | | | | | | | | | 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-2316-20/+214
| | | | | | | | | | | | | | | 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-235-4/+10
|\ \ \ | | | | | | | | | | | | | | | | 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-225-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-234-12/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-224-12/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '64756-re-enable-junit-reports' into 'master'Kamil Trzciński2019-07-232-9/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Junit reports Closes #64756 See merge request gitlab-org/gitlab-ce!30931
| * | | | | Enable Junit reports64756-re-enable-junit-reportsSteve Azzopardi2019-07-192-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30254 Junit reports were disabled. With https://gitlab.com/gitlab-com/gl-infra/production/issues/928 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30274 solved we should enable them again. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64756
* | | | | | Merge branch '63485-fix-pipeline-emails-to-use-group-setting' into 'master'Nick Thomas2019-07-239-50/+135
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-239-50/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user's notification email is set for a group, we should use that for pipeline emails
* | | | | | | Merge branch '64974-remove-livesum-from-ruby-sampler-metrics' into 'master'Kamil Trzciński2019-07-232-4/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Remove :livesum from RubySampler metrics See merge request gitlab-org/gitlab-ce!31047
| * | | | | | Remove :livesum from RubySampler metrics64974-remove-livesum-from-ruby-sampler-metricsAleksei Lipniagov2019-07-232-4/+9
| | | | | | |
* | | | | | | Merge branch 'bw-add-index-for-relative-position' into 'master'Nick Thomas2019-07-234-1/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index for issues on relative position, project, and state for manual sorting See merge request gitlab-org/gitlab-ce!30542
| * | | | | | | Add index for issues on relative position, projectbw-add-index-for-relative-positionBrett Walker2019-07-224-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and state
* | | | | | | | Merge branch 'sh-enable-bootsnap' into 'master'Douglas Barbosa Alexandre2019-07-236-5/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Bootsnap available via ENABLE_BOOTSNAP=1 Closes #45230 See merge request gitlab-org/gitlab-ce!30963
| * | | | | | | | Add docs for ENABLE_BOOTSNAPsh-enable-bootsnapStan Hu2019-07-191-0/+1
| | | | | | | | |
| * | | | | | | | Make Bootsnap available via ENABLE_BOOTSNAP=1Stan Hu2019-07-195-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bootsnap speeds up Rails loading and now ships by default with Rails 5.2 apps. We should promote this to a default gem and test it out in production. This will also make it possible for the Helm Charts to take advantage of this. It appears that Bootsnap with Rails 5.2.3 and all the GitLab CE gems loads fine on an ARM platform now, so it's possible that https://gitlab.com/gitlab-org/gitlab-ce/issues/34799 has been resolved. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45230
* | | | | | | | | Merge branch 'sl-qa-staging-65-fix-correct-page-issue' into 'master'Ramya Authappan2019-07-231-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure test is on login page before attempting login See merge request gitlab-org/gitlab-ce!31040
| * | | | | | | | | Replace homepage visit stepsl-qa-staging-65-fix-correct-page-issueSanad Liaquat2019-07-231-2/+2
| | | | | | | | | |
| * | | | | | | | | Temporarily remove the before block to capture screenshotsSanad Liaquat2019-07-231-3/+1
| | | | | | | | | |
| * | | | | | | | | Ensure test is on login pageSanad Liaquat2019-07-231-0/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ce-port-315-log-impersonation-actions-in-audit-log' into 'master'Ash McKenzie2019-07-234-4/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-234-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-236-5/+102
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-226-5/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'extend-yamllint-ci' into 'master'Lin Jen-Shin2019-07-234-27/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend yamllint test to changelogs See merge request gitlab-org/gitlab-ce!31017
| * | | | | | | | | | | Extend yamllint test to changelogsPeter Dave Hello2019-07-234-27/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc !30979
* | | | | | | | | | | Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'Sean McGivern2019-07-236-7/+59
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple pipeline support for Build status See merge request gitlab-org/gitlab-ce!30828
| * | | | | | | | | | | Add specs for specifying pipeline behaviorMatija Čupić2019-07-236-14/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds specs for testing the new behavior of specifying a pipeline when POSTing a status.
| * | | | | | | | | | | Multiple pipeline support for Build statusGaetan Semet2019-07-173-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows user to specify the pipeline ID when several pipelines has been triggered on the same branch and commit. Signed-off-by: Gaetan Semet <gaetan.semet@renault.com>
* | | | | | | | | | | | Merge branch 'georgekoltsov/64377-add-better-log-msg-to-members-mapper' into ↵Ash McKenzie2019-07-233-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add better error message to MembersMapper#ensure_default_member! See merge request gitlab-org/gitlab-ce!30838
| * | | | | | | | | | | Add changelog entrygeorgekoltsov/64377-add-better-log-msg-to-members-mapperGeorge Koltsov2019-07-232-1/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Add MembersMapper#ensure_default_user! specGeorge Koltsov2019-07-171-0/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Add better error message MembersMapper#ensure_default_member!George Koltsov2019-07-171-0/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More details in: https://gitlab.com/gitlab-org/gitlab-ce/issues/64377
* | | | | | | | | | | Merge branch 'FixLocaleEN' into 'master'Bob Van Landuyt2019-07-232-6/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated mapping key in config/locales/en.yml See merge request gitlab-org/gitlab-ce!30980
| * | | | | | | | | | | Remove duplicated mapping key in config/locales/en.ymlPeter Dave Hello2019-07-222-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "errors" section was defined twice in this file, the first one was the once being removed here, another one is at line 164 (before removal) or line 158 (after removal). The content of duplicated strings definition are totally the same, the second part has more data (41 lines in total, compare to the removed 6 lines), so I removed the first part but not the second part. cc !16710
* | | | | | | | | | | | Merge branch 'rm-src-branch' into 'master'Grzegorz Bizon2019-07-235-20/+124
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support remove source branch on merge w/ push options See merge request gitlab-org/gitlab-ce!30728
| * | | | | | | | | | | | Refactor create_params and update_paramsrm-src-branchChristian Couder2019-07-171-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's move shared code between create_params and update_params into a new base_params. update_params becomes very thin, but it still may be clearer that the params are being shared if we have a method called base_params, rather than have create_params merge in update_params.
| * | | | | | | | | | | | Support rm src branch on merge w/ push optionChristian Couder2019-07-175-1/+109
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge branch 'backward-compatible-request-profiles' into 'master'Grzegorz Bizon2019-07-237-32/+130
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring backward compatibility for request profiles See merge request gitlab-org/gitlab-ce!30956
| * | | | | | | | | | | Bring backward compatibility for request profilesKamil Trzciński2019-07-237-32/+130
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'tz-update-stylelint' into 'master'Fatih Acet2019-07-232-214/+309
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates all our stylelint dependencies See merge request gitlab-org/gitlab-ce!31028
| * | | | | | | | | | | Updates all our stylelint dependenciesTim Zallmann2019-07-232-214/+309
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed stylelint-error-string-formatter as this was having a circular reference fail
* | | | | | | | | | | Merge branch '6544-remove-scss-diff-ce' into 'master'Phil Hughes2019-07-233-0/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve difference in app/assets/stylesheets/application.scss See merge request gitlab-org/gitlab-ce!31007
| * | | | | | | | | | | Resolve difference in app/assets/stylesheets/application.scss6544-remove-scss-diff-ceLukas Eipert2019-07-223-0/+15
| | | | | | | | | | | |