summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Properly handle `sidekiq` skipsidekiq-interrupt-running-jobsKamil Trzciński2019-08-215-17/+31
| | | | Transform `CancelledError` into `JobRetry::Skip`
* Improve resillency of monitorKamil Trzciński2019-08-214-41/+141
| | | | | | | - Retry connection when it fails - Properly shutdown daemon - Stop monitor if the Exception is raised - Properly guard exception handling
* Perform cheap thread findKamil Trzciński2019-08-212-12/+17
| | | | | | | | If we process message that is not designated to us previously we would fire a separate Thread for that. We don't need to do it. We can cheaply check if thread is available, if it is, we can perform expensive operation then.
* Rework `Sidekiq::JobsThreads` into `Monitor`Kamil Trzciński2019-08-219-180/+523
| | | | | | | | | | This makes: - very shallow `Middleware::Monitor` to only request tracking of sidekiq jobs, - `SidekiqStatus::Monitor` to be responsible to maintain persistent connection to receive messages, - `SidekiqStatus::Monitor` to always use structured logging and instance variables
* Allow to interrupt running jobsKamil Trzciński2019-08-214-0/+181
| | | | | | | | | | | | | | | | | This adds a middleware to track all threads for running jobs. This makes sidekiq to watch for redis-delivered notifications. This makes be able to send notification to interrupt running sidekiq jobs. This does not take into account any native code, as `Thread.raise` generates exception once the control gets back to Ruby. The separate measure should be taken to interrupt gRPC, shellouts, or anything else that escapes Ruby.
* Merge branch '59786-show-renamed-file-in-mr' into 'master'Filipa Lacerda2019-08-213-2/+7
|\ | | | | | | | | | | | | Fix to show renamed file in mr Closes #59786 See merge request gitlab-org/gitlab-ce!31888
| * Fix to show renamed file in mrSamantha Ming2019-08-213-2/+7
|/
* Merge branch 'winh-prevent-multiple-recaptcha-modals' into 'master'Kushal Pandya2019-08-212-0/+9
|\ | | | | | | | | Throw error for multiple RecaptchaModal instances See merge request gitlab-org/gitlab-ce!32017
| * Throw error for multiple RecaptchaModal instancesWinnie Hellmann2019-08-212-0/+9
|/
* Merge branch ↵Filipa Lacerda2019-08-212-2/+14
|\ | | | | | | | | | | | | 'ce-port-12918-metrics-dashboard-alerting-menu-unavailable-when-additional-panel-types-is-enabled-2' into 'master' CE Port: Use EE panel type to display alert menu correctly in dashboards See merge request gitlab-org/gitlab-ce!31873
| * CE Port: Use EE panel type to display alert menu correctly in dashboardsMiguel Rincon2019-08-212-2/+14
|/
* Merge branch 'winh-autosave_spec-sync' into 'master'Kushal Pandya2019-08-211-4/+7
|\ | | | | | | | | Make native event test in autosave_spec.js synchronous See merge request gitlab-org/gitlab-ce!32003
| * Make native event test in autosave_spec.js synchronousWinnie Hellmann2019-08-211-4/+7
|/
* Merge branch '46299-wiki-page-creation' into 'master'Filipa Lacerda2019-08-2118-211/+287
|\ | | | | | | | | Remove wiki page slug dialog step when creating wiki page See merge request gitlab-org/gitlab-ce!31362
| * New wiki page redirects user to random slug46299-wiki-page-creationLuke Duncalfe2019-08-2118-211/+287
| | | | | | | | | | | | | | | | | | | | Previously we asked a user to enter a new slug before taking them to the Create Page page. As a UX improvement, we now take them to a randomly generated URI so they can begin creating their new page. https://gitlab.com/gitlab-org/gitlab-ce/issues/46299
* | Merge branch '65427-improve-system-notes-for-zoom-links' into 'master'Thong Kuah2019-08-215-12/+17
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Improve system notes for Zoom links" Closes #65427 See merge request gitlab-org/gitlab-ce!31410
| * | Improve system notes for Zoom links65427-improve-system-notes-for-zoom-linksJacopo2019-08-175-12/+17
| | | | | | | | | | | | | | | | | | | | | changes: @user a Zoom call was added to this issue into: @user added a Zoom call to this issue Same concept appleis for "removed"
* | | Merge branch 'clarify-only-except-docs' into 'master'Evan Read2019-08-211-1/+15
|\ \ \ | | | | | | | | | | | | | | | | Added an example to doumentation for using multiple build policies with only: and except: See merge request gitlab-org/gitlab-ce!31983
| * | | Added an example to doumentation for using multiple build policies with ↵drew2019-08-211-1/+15
|/ / / | | | | | | | | | only: and except:
* | | Merge branch 'docs-k8s-caps' into 'master'Evan Read2019-08-211-14/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update capitalization in k8s cheat sheet Closes #65816 See merge request gitlab-org/gitlab-ce!32036
| * | | Update capitalization in k8s cheat sheetMarcel Amirault2019-08-211-14/+14
|/ / /
* | | Merge branch 'docs-patch-71' into 'master'Achilleas Pipinellis2019-08-212-2/+8
|\ \ \ | | | | | | | | | | | | | | | | Improve details about when rebase button is offered See merge request gitlab-org/gitlab-ce!29644
| * | | Improve details about when rebase button is offeredBen Bodenmiller2019-08-212-2/+8
|/ / /
* | | Merge branch 'docs/pipelines-gitaly-version-removal' into 'master'Evan Read2019-08-211-3/+2
|\ \ \ | | | | | | | | | | | | | | | | Remove Gitaly version in the docs See merge request gitlab-org/gitlab-ce!32006
| * | | Remove Gitaly version in the docsdocs/pipelines-gitaly-version-removalZeger-Jan van de Weg2019-08-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's very hard for end user to know what version of Gitaly is running, and they should not have to care about this detail either. Gitaly 1.21.0 was released before 11.9 was tagged, so it's an unsupported version too. This change removes the reference.
* | | | Merge branch 'zm-rephrase-ci-docs' into 'master'Evan Read2019-08-212-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update grammar in DAG docs See merge request gitlab-org/gitlab-ce!32021
| * | | | Update grammar in DAG docszm-rephrase-ci-docsZeff Morgan2019-08-202-3/+3
| | | | |
* | | | | Merge branch 'winh-frontend-testing-code-blocks-docs' into 'master'Evan Read2019-08-211-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix code blocks in frontend testing guide (docs) See merge request gitlab-org/gitlab-ce!32002
| * | | | | Fix code blocks in frontend testing guide (docs)Winnie Hellmann2019-08-211-8/+8
|/ / / / /
* | | | | Merge branch 'docs-fix-soft-deletion' into 'master'Evan Read2019-08-214-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix outdated references to soft deletion See merge request gitlab-org/gitlab-ce!31982
| * | | | Fix outdated references to soft deletiondocs-fix-soft-deletionMarkus Koller2019-08-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We stopped using soft deletion for issues and merge requests in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15789, and for boards we apparently never used it.
* | | | | Merge branch 'master' into 'master'Paul Slaughter2019-08-203-5/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove margin from user header buttons Closes #57966 See merge request gitlab-org/gitlab-ce!30878
| * | | | | Remove margin from user header buttonsLucy Fox2019-08-203-5/+9
|/ / / / /
* | | | | Merge branch '66066-dark-theme-style-for-expansion-on-mr-diffs' into 'master'Mike Greiling2019-08-209-21/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match syntax highlighting theme for line expansion rows Closes #66066 See merge request gitlab-org/gitlab-ce!31821
| * | | | | Add syntax highlighting for line expansionSamantha Ming2019-08-209-21/+42
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - dark - white - monokai - none - solarized-dark - solarized-light
* | | | | Merge branch 'ci-config-on-policy' into 'master'Kamil Trzciński2019-08-2022-43/+1406
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Flexible Rules for CI Build config See merge request gitlab-org/gitlab-ce!29011
| * | | | | Introducing new Syntax for Ci::Build inclusion rulesdrew2019-08-2022-43/+1406
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added Gitlab::Ci::Config::Entry::Rules and Gitlab::Ci::Config::Entry::Rules:Rule to handle lists of Rule objects to be evalauted for job inclusion - Added `if:` and `changes:` as available Rules::Rule::Clause classes - Added Rules handling logic to Seed::Build#included? with extra specs - Use DisallowedKeysValidator to mutually exclude rules: from only:/except: on job config
* | | | | Merge branch 'shell-9-4-1' into 'master'Douwe Maan2019-08-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-shell v9.4.1 See merge request gitlab-org/gitlab-ce!32022
| * | | | | Use gitlab-shell v9.4.1Douwe Maan2019-08-201-1/+1
| | | | | |
* | | | | | Merge branch 'update-babel-to-7.5.5' into 'master'Mike Greiling2019-08-203-22/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade babel to 7.5.5 See merge request gitlab-org/gitlab-ce!31819
| * | | | | | Upgrade babel to 7.5.5update-babel-to-7.5.5Takuya Noguchi2019-08-143-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch 'ssh-add-no-redirect' into 'master'Achilleas Pipinellis2019-08-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ssh_keys docs, don't redirect stdout of ssh-add See merge request gitlab-org/gitlab-ce!31630
| * | | | | | | Remove inoperative >/dev/nullAlexander Oleynikov2019-08-081-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'docs-repository-languages-img' into 'master'Achilleas Pipinellis2019-08-203-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update repository languages screenshot See merge request gitlab-org/gitlab-ce!31925
| * | | | | | | | Update repository languages screenshotMarcel Amirault2019-08-203-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'winh-fix-mocks_helper_spec' into 'master'Mike Greiling2019-08-201-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix assertion in mocks_helper_spec.js See merge request gitlab-org/gitlab-ce!32005
| * | | | | | | | Fix assertion in mocks_helper_spec.jsWinnie Hellmann2019-08-201-1/+3
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-standardize-log-names' into 'master'Mayra Cabrera2019-08-2010-20/+36
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize remote_ip and path keys for auth.log and api_json.log Closes #66167 See merge request gitlab-org/gitlab-ce!31921
| * | | | | | | Standardize remote_ip and path keys for auth.log and api_json.logStan Hu2019-08-2010-20/+36
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current `auth.log` uses `fullpath` and `ip`, while `api_json.log` uses `remote_ip` and `path` for the same fields. Let's standardize these namings to make it easier for people working with the data. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66167
* | | | | | | Merge branch 'docs/rename-geo-pages' into 'master'Achilleas Pipinellis2019-08-202-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Harmonizes titles between two Geo landing pages See merge request gitlab-org/gitlab-ce!31944