summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch '34952-only-tags-is-not-taken-in-account-in-the-cache-gems-job' ↵Robert Speicher2018-01-251-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "`only: - tags` is not taken in account in the `cache gems` job" Closes #34952 See merge request gitlab-org/gitlab-ce!16721
| * | | | | | | | | | | Ensure the job also run for tagsRémy Coutable2018-01-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'move-users-spinach-tests-to-rspec' into 'master'Robert Speicher2018-01-253-124/+107
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move user page spinach tests to RSpec See merge request gitlab-org/gitlab-ce!16598
| * | | | | | | | | | | Move user page spinach tests to RSpecSemyon Pupkov2018-01-253-124/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | | | | | | Merge branch '42338-rubocop-cache' into 'master'Robert Speicher2018-01-252-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache rubocop cache for CI Closes #42338 See merge request gitlab-org/gitlab-ce!16700
| * | | | | | | | | | | | Cache rubocop cache for CI42338-rubocop-cacheLin Jen-Shin2018-01-252-1/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'katex-throwOnError' into 'master'Filipa Lacerda2018-01-252-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable throwOnError in KaTeX to reveal user where is the problem See merge request gitlab-org/gitlab-ce!16684
| * | | | | | | | | | | | Disable throwOnError in KaTeX to reveal user where is the problemJakub Jirutka2018-01-242-1/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From KaTeX documentation: > throwOnError: boolean. If true, KaTeX will throw a ParseError when > it encounters an unsupported command. If false, KaTeX will render > the unsupported command as text in the color given by errorColor. > (default: true) It's better to render the formula and highlight unsupported commands than just give up and render whole formula as a code; users are confused and don't know what's wrong.
* | | | | | | | | | | | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-2513-73/+75
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
| * | | | | | | | | | | | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-2513-73/+75
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-254-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling special characters in Issuable Templates Closes #40028 See merge request gitlab-org/gitlab-ce!15323
| * | | | | | | | | | | | | Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-254-4/+9
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'contrain-run-git' into 'master'Rémy Coutable2018-01-252-83/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#run_git private See merge request gitlab-org/gitlab-ce!16622
| * | | | | | | | | | | | | Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-252-83/+97
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'feat/add-section-headers-to-project-repo-buttons' into 'master'Rémy Coutable2018-01-254-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve empty project overview See merge request gitlab-org/gitlab-ce!16617
| * | | | | | | | | | | | | Improve empty project overviewGeorge Tsiolis2018-01-254-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add section headers to project repo buttons - Add primary button to content to add file when the repository is empty - Change project removal primary button from project overview to secondary button - Update headings for better alignment - Add primary button for readme only user preference
* | | | | | | | | | | | | | Merge branch 'update-secret-values-to-support-dynamic-elements' into 'master'Filipa Lacerda2018-01-254-26/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update secret_values to support dynamic elements within parent See merge request gitlab-org/gitlab-ce!16665
| * | | | | | | | | | | | | | Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elementsEric Eastwood2018-01-244-26/+117
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110 which introduces a dynamic variable list and needs secrets. We use the valueSelector/placeholderSelector options to avoid selecting the last empty row.
* | | | | | | | | | | | | | Merge branch '42385-enable-the-rspec-singlelinehook-cop' into 'master'Robert Speicher2018-01-252-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Re-enable the `RSpec/SingleLineHook` cop" Closes #42385 See merge request gitlab-org/gitlab-ce!16704
| * | | | | | | | | | | | | | Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again42385-enable-the-rspec-singlelinehook-copRémy Coutable2018-01-252-5/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'profile-link-target-blank' into 'master'Rémy Coutable2018-01-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open links in a new tab on the user page See merge request gitlab-org/gitlab-ce!16705
| * | | | | | | | | | | | | | Open links in a new tab on the user pageAchilleas Pipinellis2018-01-251-3/+3
| | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenarioqa-secret-variables-scenarioLin Jen-Shin2018-01-2561-201/+383
| | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Make Gitaly RepositoryExists opt-out Fix .batch_lfs_pointers accepting a lazy enumerator Look at notes created just before merge when deciding if an MR can be reverted Update missing paths Default to HTTPS for all Gravatar URLs Add note within ux documentation that further changes should be made within the design.gitlab project Moves status icon into a vue file and adds tests Moves merging component into a vue file, adds i18n and better test cases Prefer local variables instead Add an test for QA::Runtime::RSAKey Move initialize method later. Also test if the fingerprint is correct Generate ssh key on the fly for QA
* | | | | | | | | | | | | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'Grzegorz Bizon2018-01-253-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix .batch_lfs_pointers accepting a lazy enumerator See merge request gitlab-org/gitlab-ce!16701
| * | | | | | | | | | | | | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-253-3/+18
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'gitaly-repo-exists' into 'master'Douwe Maan2018-01-252-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitaly RepositoryExists opt-out See merge request gitlab-org/gitlab-ce!16680
| * | | | | | | | | | | | | | | | Make Gitaly RepositoryExists opt-outJacob Vosmaer (GitLab)2018-01-252-1/+6
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-252-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look at system notes created just before merge as well as after, when deciding if an MR can be reverted Closes #42377 See merge request gitlab-org/gitlab-ce!16678
| * | | | | | | | | | | | | | | Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-252-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds, while `MergeRequest::Metrics#merged_at` does. This breaks the optimization assumption that we only need to search for notes created *after* the MR has been merged. Unsynchronized system clocks also make this a dangerous assumption to make. Adding a minute of leeway still optimizes away most notes, but allows both cases to be handled more gracefully. If the system clocks are more than a minute out, we'll still be broken, of course.
* | | | | | | | | | | | | | | | Merge branch 'ux-guide-deprecation' into 'master'Jacob Schatz2018-01-252-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note within ux documentation that further changes should be made within the… See merge request gitlab-org/gitlab-ce!16686
| * | | | | | | | | | | | | | | Add note within ux documentation that further changes should be made within ↵ux-guide-deprecationtauriedavis2018-01-242-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the design.gitlab project
* | | | | | | | | | | | | | | | Merge branch 'default-to-https-for-gravatar-urls' into 'master'Rémy Coutable2018-01-2515-56/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to HTTPS for all Gravatar URLs See merge request gitlab-org/gitlab-ce!16666
| * | | | | | | | | | | | | | | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-2515-56/+63
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default.
* | | | | | | | | | | | | | | Merge branch 'qa-deploy-key-scenario' into 'master'Grzegorz Bizon2018-01-2511-21/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate ssh key on the fly for QA See merge request gitlab-org/gitlab-ce!16562
| * | | | | | | | | | | | | | | Prefer local variables insteadqa-deploy-key-scenarioLin Jen-Shin2018-01-241-4/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add an test for QA::Runtime::RSAKeyLin Jen-Shin2018-01-241-0/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move initialize method later.Lin Jen-Shin2018-01-241-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into qa-deploy-key-scenarioLin Jen-Shin2018-01-24356-4642/+6164
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (106 commits) Remove callback as we already update accordingly on services added missing imports correctly imports performance bar Added imports for dispatcher routes Make the exposing of the Application secret more explicit Add documentation about when the application API was added Add application create API Return a blank JSON response for a missing .js file to prevent Rails CSRF errors add CHANGELOG.md entry for !15804 disable CopyAsGFM on iOS due to bug in webkit Update changelog GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side Return more consistent values for merge_status on MR API Fix a migration spec messing up the MergeRequestDiff DB schema Backport changes to Gitlab::Checks::ChangeAccess from EE remove webpack bundle tag for monitoring:environments:metrics Set timezone for karma to UTC Upgrade jasmine + raven to newer versions Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze ...
| * | | | | | | | | | | | | | | | Also test if the fingerprint is correctLin Jen-Shin2018-01-225-8/+44
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'qa-deploy-key-factory-product' into qa-deploy-key-scenarioLin Jen-Shin2018-01-224-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qa-deploy-key-factory-product: Add .qa-project-deploy-keys to locate it Scrap the deploy key title and match it in test
| * | | | | | | | | | | | | | | | | Generate ssh key on the fly for QALin Jen-Shin2018-01-226-13/+27
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'fl-more-mr-widget' into 'master'Phil Hughes2018-01-2526-117/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves status icon into a vue file and adds tests See merge request gitlab-org/gitlab-ce!16703
| * | | | | | | | | | | | | | | | | | Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-254-5/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-25122-592/+1461
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" Update CHANGELOG.md for 10.4.1 Add a gRPC health check to ensure Gitaly is up Add formatted_data attribute to Git::WikiPage Avoid array indices to fixtures in JS specs Migrate .batch_lfs_pointers to Gitaly Updates `Revert this merge request` text Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Workaround a recaptcha pop-up that cannot be tested Moves more mr widget components into vue files Adds i18n Adds better test coverage Execute system hooks after-commit when executing project hooks Remove one Spinach job and add one RSpec job Migrate repository bundling to Gitaly Use limit for search count queries Fix offense in runners settings QA page object class Wait for runner until it registers itself in QA tests Fix static-analysis offenses in QA support class Add specific views / selectors for QA runners page Add views / selectors for pipeline show page object ...
| * | | | | | | | | | | | | | | | | | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-2426-117/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves merging component into a vue file, adds i18n and better test cases
| | | | | | | | | | | | | | | | * | | Prefer local variables over given/letLin Jen-Shin2018-01-251-3/+3
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * | | Try to restore page's stateLin Jen-Shin2018-01-251-10/+5
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * | | Add more views checkLin Jen-Shin2018-01-251-0/+9
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * | | Respect the latest changes from masterLin Jen-Shin2018-01-258-48/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically using the new expand_section
| | | | | | | | | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenarioLin Jen-Shin2018-01-25478-5327/+8129
| | | | | | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (136 commits) Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'" Add modal for deleting a milestone Revert "Merge branch 'remove-rugged-walk' into 'master'" Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" Update CHANGELOG.md for 10.4.1 Add a gRPC health check to ensure Gitaly is up Add formatted_data attribute to Git::WikiPage Avoid array indices to fixtures in JS specs Migrate .batch_lfs_pointers to Gitaly Updates `Revert this merge request` text Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Workaround a recaptcha pop-up that cannot be tested Uses sprite icon to render verified commit badge and uniforms css colors Moves more mr widget components into vue files Adds i18n Adds better test coverage Execute system hooks after-commit when executing project hooks Remove one Spinach job and add one RSpec job Remove callback as we already update accordingly on services Fix typo in `.gitlab-ci.yml` heading Migrate repository bundling to Gitaly ...