summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'Robert Speicher2019-07-231-0/+5
|\ | | | | | | | | 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-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'safe-archiving-for-traces' into 'master'Kamil Trzciński2019-07-231-0/+5
|\ \ | | | | | | | | | | | | 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-231-0/+5
| | | | | | | | | | | | | | | 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-231-0/+5
|\ \ \ | | | | | | | | | | | | | | | | 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-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 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-231-0/+5
| | | | | |
* | | | | | Merge branch 'bw-add-index-for-relative-position' into 'master'Nick Thomas2019-07-231-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and state
* | | | | | | Merge branch 'sh-enable-bootsnap' into 'master'Douglas Barbosa Alexandre2019-07-231-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Bootsnap available via ENABLE_BOOTSNAP=1 Closes #45230 See merge request gitlab-org/gitlab-ce!30963
| * | | | | | | Make Bootsnap available via ENABLE_BOOTSNAP=1Stan Hu2019-07-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'if-64257-active_session_lookup_key_cleanup' into 'master'Bob Van Landuyt2019-07-231-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Extend yamllint test to changelogsPeter Dave Hello2019-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc !30979
* | | | | | | | | Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'Sean McGivern2019-07-231-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple pipeline support for Build status See merge request gitlab-org/gitlab-ce!30828
| * | | | | | | | | Add specs for specifying pipeline behaviorMatija Čupić2019-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds specs for testing the new behavior of specifying a pipeline when POSTing a status.
| * | | | | | | | | Multiple pipeline support for Build statusGaetan Semet2019-07-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-231-0/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'FixLocaleEN' into 'master'Bob Van Landuyt2019-07-231-0/+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-221-0/+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-231-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+5
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | hoverable area on collapsed sidebar iconsMichel Engelen2019-07-231-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-7-0' into 'master'Grzegorz Bizon2019-07-231-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.7.0/12.1.0 See merge request gitlab-org/gitlab-ce!30950
| * | | | | | | | Update GitLab Runner Helm Chart to 0.7.0update-gitlab-runner-helm-chart-to-0-7-0Steve Azzopardi2019-07-191-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch '64091-fix-sprockets-paths' into 'master'Stan Hu2019-07-221-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix xterm CSS not loading Closes #64091 See merge request gitlab-org/gitlab-ce!31023
| * | | | | | | | | Add CHANGELOG.md entryMike Greiling2019-07-221-0/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Convert githost.log to JSON formatStan Hu2019-07-221-0/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to parse this in production and adds the `correlation_id` if available.
* | | | | | | | Merge branch 'fix-i18n-updated-projects' into 'master'Clement Ho2019-07-221-0/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Fix translation of 'Updated' term in projects list See merge request gitlab-org/gitlab-ce!30958
| * | | | | | | Fix translation of 'Updated' term in projects listPaul Gascou-Vaillancourt2019-07-221-0/+5
| | | | | | | |
* | | | | | | | Validate certificate chain only if it's changedVladimir Shushlin2019-07-221-0/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | | | | | Apply suggestion to changelogs/unreleased/maintainers-can-create-subgroup.ymlFabio Papa2019-07-191-1/+1
| | | | | | | |
| * | | | | | | Add changelogFabio Papa2019-07-191-0/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'dm-submodule-helper-routing' into 'master'Nick Thomas2019-07-221-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure SubmoduleHelper works outside view context Closes #64833 See merge request gitlab-org/gitlab-ce!31005
| * | | | | | Ensure SubmoduleHelper works outside view contextdm-submodule-helper-routingDouwe Maan2019-07-221-0/+5
| | | | | | |
* | | | | | | Display group id on group admin pageZsolt Kovari2019-07-221-0/+5
| | | | | | |
* | | | | | | Display project id on project admin pageZsolt Kovari2019-07-221-0/+5
| | | | | | |
* | | | | | | Merge branch '55564-remove-if-in-before-after-action' into 'master'Lin Jen-Shin2019-07-221-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `if:` argument in before_action and alike when `only:` is also used Closes #55564 See merge request gitlab-org/gitlab-ce!24412
| * | | | | | | Rewrite `if:` argument in before_action and alike when `only:` is also usedGeorge Thomas2019-07-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #55564 This is first discovered in #54739 (comment 122609857) that if both if: and only: are used in a before_action or after_action or alike, if: is completely ignored.
* | | | | | | | Removed project autocomplete paginationJan Provaznik2019-07-221-0/+5
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pagination is not used anywhere so there is no reason to keep it. It seems the usage of offset_id was probably removed in 90c60138db4e1f86026aac5760febe4ba066ca30
* | | | | | | Merge branch ↵Douwe Maan2019-07-221-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64697-markdown-issues-checkbox-inside-blockquote-status-won-t-be-saved' into 'master' Markdown issues: Checkbox inside blockquote status won't be saved See merge request gitlab-org/gitlab-ce!30952
| * | | | | | | Properly identify task lists inside a blockquote64697-markdown-issues-checkbox-inside-blockquote-status-won-t-be-savedBrett Walker2019-07-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the task list regex to understand blockquote characters that can come before the task item marker
* | | | | | | | OAuth2 support for GitLab personal access tokensSteve Abrams2019-07-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PATs are accepted using the OAuth2 compliant header "Authorization: Bearer {token}" in order to allow for OAuth requests while 2FA is enabled.