summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add new RSpecFlaky::FlakyExamplesCollection and RSpecFlaky::Config classesrc/fix-flaky_exampleRémy Coutable2017-10-056-36/+251
| | | | 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 'capture-rev-list-errors' into 'master'Sean McGivern2017-10-041-1/+1
|\ | | | | | | | | Include RevList error messages in exceptions See merge request gitlab-org/gitlab-ce!14658
| * Include RevList error messages in exceptionscapture-rev-list-errorsJacob Vosmaer2017-10-031-1/+1
| |
* | Merge branch 'gitaly-fetch-ref' into 'master'Sean McGivern2017-10-047-22/+80
|\ \ | | | | | | | | | | | | | | | | | | Let fetch_ref pull from Gitaly instead of from disk Closes gitaly#585 See merge request gitlab-org/gitlab-ce!14588
| * | Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-047-22/+80
| | |
* | | Merge branch 'missing-exception-variable' into 'master'Sean McGivern2017-10-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Add missing exception variable See merge request gitlab-org/gitlab-ce!14677
| * | | Add missing exception variableJacob Vosmaer2017-10-041-1/+1
| |/ /
* | | Merge branch 'merge-request-notes-performance' into 'master'Sean McGivern2017-10-044-10/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use a UNION ALL for getting merge request notes Closes #38508 See merge request gitlab-org/gitlab-ce!14620
| * | | Use a UNION ALL for getting merge request notesmerge-request-notes-performanceYorick Peterse2017-10-024-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this particular case the use of UNION ALL leads to a better query plan compared to using 1 big query that uses an OR statement to combine different data sources. See https://gitlab.com/gitlab-org/gitlab-ce/issues/38508 for more information.
* | | | Merge branch 'js-load-specific-locales' into 'master'Phil Hughes2017-10-046-26/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load only the currently needed JS locale file Closes #38470 See merge request gitlab-org/gitlab-ce!14533
| * | | | Load only the currently needed JS locale fileTim Zallmann2017-10-046-26/+19
|/ / / /
* | | | Merge branch 'fix_migration_with_fast_forward_option' into 'master'Sean McGivern2017-10-043-3/+30
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix AddFastForwardOptionToProject migration See merge request gitlab-org/gitlab-ce!14676
| * | | Add a new migration to make sure that fast forward column exists in projects ↵fix_migration_with_fast_forward_optionValery Sizov2017-10-043-2/+29
| | | | | | | | | | | | | | | | table
| * | | Fix AddFastForwardOptionToProject migrationValery Sizov2017-10-041-1/+1
| | | |
* | | | Merge remote-tracking branch 'dev/master'Jarka Kadlecova2017-10-041-0/+4
|\ \ \ \
| * \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-10-041-0/+4
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-10-041-0/+4
| | |\ \ \ \
| | | * | | | Update CHANGELOG.md for 9.5.7Jose Ivan Vargas2017-10-031-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch '36742-hide-close-mr-button-on-merge' into 'master'Fatih Acet2017-10-046-1/+67
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide close MR button after merge without reloading page Closes #36742 See merge request gitlab-org/gitlab-ce!14122
| * | | | | | Hide close MR button after merge without reloading pageJacopo2017-09-246-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After merging a MR the close button is hidden, without reloading the page.
* | | | | | | Merge branch 'dm-pat-revoke' into 'master'Sean McGivern2017-10-044-3/+14
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set default scope on PATs that don't have one set to allow them to be revoked Closes #38650 See merge request gitlab-org/gitlab-ce!14660
| * | | | | | Set default scope on PATs that don't have one set to allow them to be revokeddm-pat-revokeDouwe Maan2017-10-034-3/+14
| | | | | | |
* | | | | | | Merge branch 'icons-profile-icons' into 'master'Phil Hughes2017-10-041-9/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Updated Profile Events Helper to use SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14577
| * | | | | | Updated Profile Events Helper to use SVG Sprite IconsTim Zallmann2017-10-041-9/+11
|/ / / / / /
* | | | | | Merge branch '3612-update-script-template-order-in-vue-files' into 'master'Filipa Lacerda2017-10-0412-97/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-arrange <script> tags before <template> tags in .vue files Closes #38743 See merge request gitlab-org/gitlab-ce!14671
| * | | | | | Re-arrange <script> tags before <template> tags in .vue files3612-update-script-template-order-in-vue-filesEric Eastwood2017-10-0312-97/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38743
* | | | | | | Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master'Filipa Lacerda2017-10-042-0/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable comment textarea while submitting a new comment. Closes #37858 See merge request gitlab-org/gitlab-ce!14541
| * | | | | | | Add tests for handle save method of the comment form.acet-disabled-comment-textarea-while-requestingFatih Acet2017-10-031-0/+40
| | | | | | | |
| * | | | | | | Disable comment textarea while submitting a new comment.Fatih Acet2017-10-031-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'winh-vue-styleguide-link-docs' into 'master'Filipa Lacerda2017-10-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to Vue.js style guide See merge request gitlab-org/gitlab-ce!14667
| * | | | | | | Fix link to Vue.js style guidewinh-vue-styleguide-link-docswinh-vue-styleguide-linkWinnie Hellmann2017-10-031-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'fix-ssh-key-mutation' into 'master'Douwe Maan2017-10-042-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure key fingerprints are generated correctly when modified See merge request gitlab-org/gitlab-ce!14663
| * | | | | | | | Ensure key fingerprints are generated correctly when modifiedNick Thomas2017-10-032-0/+11
| | | | | | | | |
* | | | | | | | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-0443-155/+1541
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load and paginate registry image list Closes #31050 See merge request gitlab-org/gitlab-ce!14303
| * | | | | | | | | Fix rubocop error31050-registry-image-listsFilipa Lacerda2017-10-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix broken testFilipa Lacerda2017-10-031-2/+5
| | | | | | | | | |
| * | | | | | | | | Fix rubocop failuresKamil Trzcinski2017-10-031-8/+8
| | | | | | | | | |
| * | | | | | | | | Add serializer matchersKamil Trzcinski2017-10-0212-62/+279
| | | | | | | | | |
| * | | | | | | | | [ci skip] Render separator only when both values are presentFilipa Lacerda2017-09-281-2/+4
| | | | | | | | | |
| * | | | | | | | | Improve loading iconFilipa Lacerda2017-09-281-0/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-28251-1857/+2772
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (91 commits) refactor emails service fix update service refactor users update service refactor keys controller refactor some controllers to make them EE friendly fix specs fix users update service update initializers refactor services to match EE signature Change recommended MySQL version to 5.6 Clean merge_jid whenever necessary on the merge process Rolling back change to n+1 detection Breadcrumbs receives padding when double lined Add EEP to headings Added some Gitaly docs to `docs/development` Check orientation of profile image Fixes commit comments in side-by-side diff view Update CHANGELOG.md for 10.0.2 Fix linting errors in locale/index.js Update CI parallelization description ...
| * | | | | | | | | | Simplifies HTML by removing the empty state in cellsFilipa Lacerda2017-09-271-18/+4
| | | | | | | | | | |
| * | | | | | | | | | Changes after reviewFilipa Lacerda2017-09-272-7/+7
| | | | | | | | | | |
| * | | | | | | | | | Fixes destroy endpointFilipa Lacerda2017-09-261-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Adds tests for new table componentFilipa Lacerda2017-09-2610-89/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes eslint problems
| * | | | | | | | | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-26433-2131/+5681
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (62 commits) Fix a dash being rendered in the note's access role Remove dead `Gitlab::Markdown::Pipeline` class Add CHANGELOG entry Fix locked shared runners problem Document manual cleanup after background migration stealing Removes cycle analytics service and store from global namespace Fix PG::UniqueViolation external_email migration Migrate Gitlab::Git::Repository#log to Gitaly Check for exec permissions also in app/ Add check for exec permissions and refactor lint doc script Update tests to reflect `user_avatar_without_link` helper changes Change mode to 644 for all md and png files Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs Add `data-src` when image is to be lazy loaded, use `tag` helper instead of `image_tag` helper Remove unnecessary use of `gsub` Fixed few gitlab:check tasks that were failing with exception Update CHANGELOG.md for 10.0.1 Remove Grit settings from default settings Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Improve list of sorting options ...
| * | | | | | | | | | | Moves table component into a separate oneFilipa Lacerda2017-09-254-127/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds better support for i18n
| * | | | | | | | | | | Improves toggle methodFilipa Lacerda2017-09-251-2/+2
| | | | | | | | | | | |
View Lorry Controller Status