summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve pgloader documentationsh-pgloader-fixesStan Hu2017-10-061-4/+158
| | | | [ci skip]
* Merge branch 'add-delete-issue-docs' into 'master'Victor Wu2017-10-064-0/+16
|\ | | | | | | | | Add delete issue docs See merge request gitlab-org/gitlab-ce!14721
| * Add delete issue docsWilliam Chia2017-10-064-0/+16
|/
* Merge branch 'content-title-link-hover-bg' into 'master'Annabel Dunstone Gray2017-10-062-1/+6
|\ | | | | | | | | Fixed the navbar title hover style being applied outside the navbar See merge request gitlab-org/gitlab-ce!14707
| * Fixed the navbar title hover style being applied outside the navbarcontent-title-link-hover-bgPhil Hughes2017-10-052-1/+6
| |
* | Merge branch 'replace_project_merge_requests.feature' into 'master'Rémy Coutable2017-10-0622-986/+773
|\ \ | | | | | | | | | | | | Replace the 'project/merge_requests.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14621
| * | Replace the 'project/merge_requests.feature' spinach test with an rspec analogreplace_project_merge_requests.featureVitaliy @blackst0ne Klachkov2017-10-0522-986/+773
| | |
* | | Merge branch 'adjusting-tooltips' into 'master'Annabel Dunstone Gray2017-10-064-0/+18
|\ \ \ | | | | | | | | | | | | | | | | Adjust tooltips to adhere to 8px grid and make them more readable See merge request gitlab-org/gitlab-ce!14380
| * | | Adjust tooltips to adhere to 8px grid and make them more readableDimitrie Hoekstra2017-10-064-0/+18
|/ / /
* | | Merge branch 'api-sentry-extra' into 'master'Douwe Maan2017-10-063-3/+31
|\ \ \ | | | | | | | | | | | | | | | | Send API parameters as extra data for sentry errors See merge request gitlab-org/gitlab-ce!14644
| * | | Send API parameters as extra data for sentry errorsapi-sentry-extraAlejandro Rodríguez2017-10-053-3/+31
| | | |
* | | | Merge branch 'valid-branch-name-dash-bug' into 'master'Sean McGivern2017-10-063-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent branches or tags from starting with invalid characters (e.g. -, .) Closes #38817 See merge request gitlab-org/gitlab-ce!14710
| * | | | Prevent branches or tags from starting with invalid characters (e.g. -, .)valid-branch-name-dash-bugJacob Schatz2017-10-053-1/+11
| | | | | | | | | | | | | | | | | | | | Closes #38817
* | | | | Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into ↵Douwe Maan2017-10-0628-20/+828
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add support for GPG subkeys in signature verification Closes #36829 See merge request gitlab-org/gitlab-ce!14517
| * | | | | Add more specs.36829-gpg-commit-not-verified-if-signed-with-a-subkeyRubén Dávila2017-10-056-14/+203
| | | | | |
| * | | | | Small refactor and fix for RuboCopRubén Dávila2017-10-052-8/+7
| | | | | |
| * | | | | Don't call update signature worker when there aren't subkeysRubén Dávila2017-10-051-1/+4
| | | | | |
| * | | | | Convert migrations to generate subkeys to a background migrationRubén Dávila2017-10-053-18/+32
| | | | | |
| * | | | | Invalidate GpgSignatures associated to GpgKeySubkeys when revoking the GpgKeyRubén Dávila2017-10-056-3/+66
| | | | | |
| * | | | | Address some feedback from last code reviewRubén Dávila2017-10-056-6/+15
| | | | | |
| * | | | | Remove no longer required methodsRubén Dávila2017-10-051-10/+0
| | | | | |
| * | | | | Convert migration to a post deployment migrationRubén Dávila2017-10-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This migration can take a bit of time to complete and I don't want to delay the deployment process.
| * | | | | Add CHANGELOG entryRubén Dávila2017-10-051-0/+5
| | | | | |
| * | | | | Add migration to generate GpgKeySubkeys records and update signaturesRubén Dávila2017-10-051-0/+59
| | | | | |
| * | | | | Fix some broken specsRubén Dávila2017-10-052-3/+3
| | | | | |
| * | | | | Address feedback from last code reviewRubén Dávila2017-10-056-16/+16
| | | | | |
| * | | | | Consider GPG subkeys when trying to update invalid GPG signaturesRubén Dávila2017-10-051-1/+2
| | | | | |
| * | | | | Remove unused associationRubén Dávila2017-10-051-1/+0
| | | | | |
| * | | | | Add more specs to cover subkeys scenariosRubén Dávila2017-10-054-0/+252
| | | | | |
| * | | | | Add some basic specs and refactor model and validationsRubén Dávila2017-10-0510-11/+114
| | | | | |
| * | | | | Add missing DOWNTIME declarationRubén Dávila2017-10-051-0/+2
| | | | | |
| * | | | | Render GPG subkeys on index pageRubén Dávila2017-10-054-1/+19
| | | | | |
| * | | | | Associate GgpSignature with GpgKeySubkey if comes from a subkeyRubén Dávila2017-10-056-13/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally we're delegating missing method calls on GpgKeySubkey to GpgKey since most of the info required when verifying a signature is found on GpgKey which is the parent of GpgKeySubkey
| * | | | | Add ability to include subkeys when finding by fingerprintRubén Dávila2017-10-052-1/+12
| | | | | |
| * | | | | Refactor the extraction and generation of GPG subkeysRubén Dávila2017-10-052-21/+5
| | | | | |
| * | | | | Use a separate model to handle GPG subkeysRubén Dávila2017-10-055-12/+22
| | | | | |
| * | | | | Delegate #key to parent when working with a GPG subkeyRubén Dávila2017-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content returned by #key is important when veryfying the signature, so given we don't want to repeat it in the database for GPG subkeys we need to delegate it to the parent.
| * | | | | Process and create subkeys when a new GPG key is createdRubén Dávila2017-10-054-2/+51
| | | | | |
* | | | | | Merge branch 'rc/fix-flaky_example' into 'master'Grzegorz Bizon2017-10-0610-142/+507
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flaky examples tracking See merge request gitlab-org/gitlab-ce!14681
| * | | | | | Add new RSpecFlaky::FlakyExamplesCollection and RSpecFlaky::Config classesRémy Coutable2017-10-066-36/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Improve the flaky examples detection jobsRémy Coutable2017-10-042-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Ensure RSpecFlaky doesn't automatically update flaky examplesRémy Coutable2017-10-044-120/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, instantiating a RspecFlaky::FlakyExample object would automatically update its first_flaky_at, last_flaky_at and last_flaky_job. That was wrong because we would overwrite every time the suite report with this false data. We now: - Get the suite report and only read from it - Write only the currently detected flaky examples in the report, so that the final report is only updated with flaky examples that were actually detected in each job. Before, job1 could overwrite the legit report from job2! - Write the newly detected flaky examples by rejecting the already tracked flaky specs instead of using another hash. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '38846-fix-ee_compat_check_for-forks' into 'master'Sean McGivern2017-10-062-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the ee_compat_check task for forks Closes #38846 See merge request gitlab-org/gitlab-ce!14727
| * | | | | | | Fix the ee_compat_check task for forksRémy Coutable2017-10-062-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'workhorse-update' into 'master'Douwe Maan2017-10-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update required Workhorse version to v3.2.0 See merge request gitlab-org/gitlab-ce!14715
| * | | | | | | | Update required Workhorse version to v3.2.0workhorse-updateAlejandro Rodríguez2017-10-051-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '38845-skip-loading-english-frontend-translation-file' into ↵Phil Hughes2017-10-062-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Skip loading English Frontend Translation File" Closes #38845 See merge request gitlab-org/gitlab-ce!14722
| * | | | | | | Made the insertion of the English Translation File conditional + removed ↵38845-skip-loading-english-frontend-translation-fileTim Zallmann2017-10-062-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | window.translations from the global object to save some memory
* | | | | | | | Merge branch '38696-fix-project-snippets-breadcrumb-link' into 'master'Rémy Coutable2017-10-062-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project snippets breadcrumb link Closes #38696 See merge request gitlab-org/gitlab-ce!14646
| * | | | | | | | Fix project snippets breadcrumb linkMark Fletcher2017-10-032-1/+6
| | | | | | | | |
View Lorry Controller Status