summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch '45159-fix-illustration' into 'master'Grzegorz Bizon2018-04-112-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixes illustration for when job log was erased45159-fix-illustrationFilipa Lacerda2018-04-094-5/+10
* | | | | | | | | | | | | | | Merge branch '37721-clean-outdated-flaky-specs-from-the-flaky-specs-report' i...Grzegorz Bizon2018-04-1110-135/+275
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use RspecFlaky::Report in scripts/prune-old-flaky-specs37721-clean-outdated-flaky-specs-from-the-flaky-specs-reportRémy Coutable2018-04-101-20/+6
| * | | | | | | | | | | | | | | Improve the architecture of RspecFlaky classes by introducing a new RspecFlak...Rémy Coutable2018-04-1010-193/+253
| * | | | | | | | | | | | | | | Introduce scripts/prune-old-flaky-specs to prune outdated flaky specs from th...Rémy Coutable2018-04-102-0/+34
| * | | | | | | | | | | | | | | Introduce RspecFlaky::ExamplesPruner to prune old flaky examplesRémy Coutable2018-04-103-0/+60
* | | | | | | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-milestones.feature' i...Rémy Coutable2018-04-1110-139/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Replace the `project/issues/milestones.feature` spinach test with an rspec an...blackst0ne2018-04-1110-139/+125
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-commits-branches.feature' in...Rémy Coutable2018-04-118-107/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Replace the `project/commits/branches.feature` spinach test with an rspec analogblackst0ne2018-04-118-107/+141
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '44697-prevue' into 'master'Fatih Acet2018-04-113-19/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Resolve "When editing a comment in an issue, the preview mode is toggled in t...Simon Knox2018-04-113-19/+29
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'zj-branch-containing-sha-opt-out' into 'master'Rémy Coutable2018-04-112-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Branch with a commit detection defaults to GitalyZeger-Jan van de Weg2018-04-112-1/+7
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'zj-tag-containing-sha-opt-out' into 'master'Rémy Coutable2018-04-112-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Tag with a commit detection defaults to GitalyZeger-Jan van de Weg2018-04-112-1/+7
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'fix/gb/fix-variables-collection-item-file' into 'master'Kamil Trzciński2018-04-112-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix file-specific variables collection item optionGrzegorz Bizon2018-04-112-10/+32
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ide-markdown-temp-file-fix' into 'master'Tim Zallmann2018-04-113-12/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | correctly dispose editor instance in specsPhil Hughes2018-04-101-1/+1
| * | | | | | | | | | | | | fixed mock URL that was causing request to failPhil Hughes2018-04-101-1/+1
| * | | | | | | | | | | | | Fixed markdown preview in IDE not working for new filesPhil Hughes2018-04-103-11/+49
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-application-settings-controller' into 'ma...Douwe Maan2018-04-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | [Rails5] Fix admin/application_settings_controllerblackst0ne2018-04-111-0/+2
* | | | | | | | | | | | | Merge branch 'mk/backport-email-handler-spec-fix' into 'master'Stan Hu2018-04-111-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix email handler spec for EEMichael Kozono2018-04-101-2/+8
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'zj-fix-environments-fixtures' into 'master'Robert Speicher2018-04-111-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix enviroments seeding on certain branch namesZeger-Jan van de Weg2018-04-101-1/+5
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'update_vendored_gitlab_ci_yml_for_auto_devops' into 'master'Robert Speicher2018-04-101-11/+42
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Update vendored .gitlab-ci.yml for Auto-DevopsOlivier Gonzalez2018-04-101-11/+42
* | | | | | | | | | | Merge branch '40487-update-vue-resource-stage' into 'master'Phil Hughes2018-04-102-68/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update state request from vue resource to axiosFilipa Lacerda2018-04-102-68/+35
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dm-seed-admin' into 'master'Sean McGivern2018-04-101-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make sure hooks run when seeding admin userDouwe Maan2018-04-101-10/+10
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-spinach' into 'master'Rémy Coutable2018-04-102-1/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [Rails5] Fix running spinach testsblackst0ne2018-04-102-1/+10
* | | | | | | | | | | Merge branch 'ab-37125-assigned-issues-query' into 'master'Yorick Peterse2018-04-102-4/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Reduce complexity of issuable finder query.ab-37125-assigned-issues-queryAndreas Brandl2018-04-092-4/+12
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '42770_setup_security_products' into 'master'Dmitriy Zaporozhets2018-04-101-4/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Security Products jobs definitionsOlivier Gonzalez2018-04-101-4/+38
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'revert-e9e800f5' into 'master'Marin Jankovski2018-04-104-104/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"Kamil Trzciński2018-04-104-104/+4
|/ / / / / / / / /
* | | | | | | | | Merge branch '40487-axios-pipelines' into 'master'Phil Hughes2018-04-106-267/+172
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace vue resources with axios for pipelines tableFilipa Lacerda2018-04-096-267/+172
* | | | | | | | | | Merge branch 'docs-gitaly-for-new-git-features' into 'master'Sean McGivern2018-04-101-4/+69
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Document process for new Git featuresJacob Vosmaer (GitLab)2018-04-101-4/+69
|/ / / / / / / / /
* | | | | | | | | Merge branch 'gitaly-0.95.0' into 'master'Sean McGivern2018-04-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use Gitaly 0.95.0gitaly-0.95.0Jacob Vosmaer2018-04-091-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'deploy-tokens-container-registry-specs' into 'master'Kamil Trzciński2018-04-105-12/+165
|\ \ \ \ \ \ \ \ \