summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-counting-commits' into 'master'Douwe Maan2018-06-191-9/+1
|\
| * Counting commits is done by Gitalyzj-counting-commitsZeger-Jan van de Weg2018-06-191-9/+1
* | Merge branch '45487-slack-tag-push-notifs' into 'master'Sean McGivern2018-06-191-17/+64
|\ \
| * | ChatNotificationService - fix sending tag notifications when "only default br...45487-slack-tag-push-notifsMario de la Ossa2018-06-141-17/+64
* | | Merge branch 'sh-optimize-locks-check-ce' into 'master'Sean McGivern2018-06-192-0/+32
|\ \ \
| * | | Eliminate N+1 queries in LFS file locks checks during a pushsh-optimize-locks-check-ceStan Hu2018-06-182-0/+32
| | |/ | |/|
* | | Merge branch 'more-group-api-sorting-options' into 'master'Douwe Maan2018-06-191-4/+45
|\ \ \
| * | | Add id as second sort parameter for group sort by nameMarko, Peter2018-06-181-1/+31
| * | | Ensure ordering for group sorting testsMarko, Peter2018-06-151-4/+4
| * | | Add id group api sorting optionMarko, Peter2018-06-121-4/+15
* | | | Merge branch 'zj-linguist-gitaly-mandatory' into 'master'Douwe Maan2018-06-191-27/+19
|\ \ \ \
| * | | | Move language detection to mandatoryZeger-Jan van de Weg2018-06-191-27/+19
* | | | | Merge branch 'zj-gitaly-license-detection' into 'master'Douwe Maan2018-06-191-19/+9
|\ \ \ \ \
| * | | | | License detection happens soley through Gitaly nowZeger-Jan van de Weg2018-06-191-19/+9
| |/ / / /
* | | | | Merge branch '48093-fix-flakey-notes-background-process-specs' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \
| * | | | | Fix flakey time-sensitive specs that rely on notes background Sidekiq jobs48093-fix-flakey-notes-background-process-specsEric Eastwood2018-06-181-1/+1
* | | | | | Merge branch 'rs-soft-removed-objects-spec-parity' into 'master'Rémy Coutable2018-06-191-7/+29
|\ \ \ \ \ \
| * | | | | | Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rbrs-soft-removed-objects-spec-parityRobert Speicher2018-06-181-7/+29
* | | | | | | Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master'Rémy Coutable2018-06-194-5/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Correct CE-EE parity in two CI-related specsrs-spec-lib-gitlab-ci-parityRobert Speicher2018-06-182-2/+2
| * | | | | | CE-EE parity to spec/lib/gitlab/ci/config_spec.rbRobert Speicher2018-06-181-1/+1
| * | | | | | CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rbRobert Speicher2018-06-181-1/+1
| * | | | | | CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rbRobert Speicher2018-06-181-1/+1
* | | | | | | Merge branch 'rails5-nil-formats' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix nil formats testrails5-nil-formatsJan Provaznik2018-06-161-1/+1
* | | | | | | Merge branch '48050-add-full-commit-sha' into 'master'Tim Zallmann2018-06-181-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Uses long sha version of the merged commit in MR widget copy to clipboard bu...48050-add-full-commit-shaFilipa Lacerda2018-06-181-2/+3
* | | | | | | Merge branch 'bvl-i18n-validation' into 'master'Rémy Coutable2018-06-183-43/+132
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Correctly translate all forms in testsbvl-i18n-validationBob Van Landuyt2018-06-153-20/+65
| * | | | | | Validate PO-variable usage in message idsBob Van Landuyt2018-06-151-0/+22
| * | | | | | Forbids combining named and unnamed variables in `gitlab.pot`Bob Van Landuyt2018-06-151-40/+62
* | | | | | | Merge branch 'dm-blockquote-trailing-whitespace' into 'master'Sean McGivern2018-06-181-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Allow trailing whitespace on blockquote fence linesDouwe Maan2018-06-181-0/+4
* | | | | | | | Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan2018-06-183-24/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Render calendar feed inline when accessed from GitLabImre Farkas2018-06-183-24/+54
* | | | | | | | | Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' ...Rémy Coutable2018-06-181-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [Rails5] Fix sessions_controller_specblackst0ne-rails5-expected-search-search-seed_project-got-nilblackst0ne2018-06-161-5/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into ...Rémy Coutable2018-06-181-3/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | [Rails5] Fix pipeline_schedules_controller_specblackst0ne-rails5-fix-pipeline-schedules-controller-specblackst0ne2018-06-161-3/+13
| |/ / / / / / /
* | | | | | | | Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'Rémy Coutable2018-06-181-0/+45
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Expose a clean_backtrace method from Gitlab::Profilerexpose-clean-backtrace-method-from-profilerSean McGivern2018-06-151-0/+45
* | | | | | | | Merge branch 'rails5-fix-47960' into 'master'Rémy Coutable2018-06-181-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Rails5 fix update_attribute usage not causing a saveJasper Maes2018-06-151-4/+4
* | | | | | | | | Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan2018-06-182-2/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-152-2/+16
* | | | | | | | | | Make Gitaly wiki RPC's mandatoryJacob Vosmaer (GitLab)2018-06-182-111/+111
* | | | | | | | | | Merge branch 'rails5-queue-name' into 'master'Sean McGivern2018-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix queue_name in Rails 5rails5-queue-nameJan Provaznik2018-06-141-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Optimised paused runners to not re-query every 3soptimise-paused-runnersKamil Trzciński2018-06-171-1/+3
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Enable no-multi-assignment in JS filesgfyoung2018-06-154-4/+8