summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove blocks from Runtime::Browser.visit calls within Mattermost testsqa-extend-click-visit-actionsddavison2019-05-201-8/+6
| | | | | | Use .perform instead of .act in Mattermost test Signed-off-by: ddavison <ddavison@gitlab.com>
* Up wait time to 60 seconds as before for LoginPageddavison2019-05-201-1/+1
|
* Implement dynamic validation on QA Pagesddavison2019-05-2013-38/+139
| | | | | | Elements now have the ability to be required on pages or not Currently using the default wait mechanism Altered the ElementWithPattern Cop to fit new splat for init
* Merge branch 'update-babel-to-7.4.4' into 'master'Mike Greiling2019-05-203-201/+404
|\ | | | | | | | | Upgrade babel to 7.4.4 See merge request gitlab-org/gitlab-ce!28437
| * Upgrade babel to 7.4.4Takuya Noguchi2019-05-183-201/+404
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'environment_terminal_methods' into 'master'Stan Hu2019-05-202-5/+3
|\ \ | | | | | | | | | | | | Use Environment#deployment_platform method instead See merge request gitlab-org/gitlab-ce!28000
| * | Use Environment#deployment_platform method insteadenvironment_terminal_methodsThong Kuah2019-05-202-5/+3
| | | | | | | | | | | | | | | | | | As this method does have `deployment_platform(environment: self.name)`, which is what the form EE needs. Allows us to remove two overrides in EE.
* | | Merge branch 'docs/add-timezone-formatting' into 'master'Evan Read2019-05-201-9/+17
|\ \ \ | | | | | | | | | | | | | | | | Docs: Add TZInfo formatted timezones See merge request gitlab-org/gitlab-ce!26743
| * | | Docs: Add TZInfo formatted timezonesDavid Coy2019-05-201-9/+17
|/ / /
* | | Merge branch '59105-padding-unclickable-pipeline-job' into 'master'Filipa Lacerda2019-05-202-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix padding of unclickable pipeline dropdown items to match links Closes #59105 See merge request gitlab-org/gitlab-ce!28485
| * | | Fix padding of unclickable pipeline dropdown items to match linksAnnabel Dunstone Gray2019-05-202-1/+6
| | | |
* | | | Merge branch 'docs/junit-mention-mr' into 'master'Evan Read2019-05-201-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to JUnit test reports from the MR index page Closes #59240 See merge request gitlab-org/gitlab-ce!28341
| * | | | Link to JUnit test reports from the MR index pageAchilleas Pipinellis2019-05-201-0/+8
|/ / / /
* | | | Merge branch 'docs/patch-61' into 'master'Achilleas Pipinellis2019-05-201-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency scanning docs - Clarify sort order See merge request gitlab-org/gitlab-ce!28493
| * | | | Update dependency scanning docs - Clarify sort orderLucas Charles2019-05-201-1/+2
|/ / / /
* | | | Merge branch 'docs/clarify-defaulting-behaviour-pipelines-for-mr' into 'master'Achilleas Pipinellis2019-05-201-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix content to not contradict Closes #61270 See merge request gitlab-org/gitlab-ce!28456
| * | | | Fix content to not contradictEvan Read2019-05-201-3/+6
|/ / / /
* | | | Merge branch '10761-add-mr-widget-review-instructions-ce-backport' into 'master'Fatih Acet2019-05-208-27/+100
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE Backport for Add Visual Review instructions to the MR Widget See merge request gitlab-org/gitlab-ce!28196
| * | | | Add backport changesSarah Groff Hennigh-Palermo2019-05-208-27/+100
|/ / / / | | | | | | | | | | | | Adds backport changes for ee
* | | | Merge branch 'if-10137-ee_specific_lines_groups_api' into 'master'Lin Jen-Shin2019-05-202-14/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE port of Move EE specific lines in API::Groups See merge request gitlab-org/gitlab-ce!28467
| * | | | CE port of Move EE specific lines in API::GroupsImre Farkas2019-05-202-14/+19
|/ / / /
* | | | Merge branch 'docs-pipelines-for-merged-ref-must-use-only-merge-requests' ↵Evan Read2019-05-201-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Clarify how to enable pipelines for merged results Closes gitlab-ee#11401 See merge request gitlab-org/gitlab-ce!28050
| * | | | Clarify how to enable pipelines for merged resultsShinya Maeda2019-05-201-0/+4
|/ / / /
* | | | Merge branch 'docs-instance_level_clusters' into 'master'Evan Read2019-05-203-6/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Initial instance level cluster docs See merge request gitlab-org/gitlab-ce!27873
| * | | | Initial instance level cluster docsJames Fargher2019-05-203-6/+31
|/ / / /
* | | | Merge branch 'fu7mu4-master-patch-90398' into 'master'Rémy Coutable2019-05-201-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Tomo Dote to Japanese proofreader See merge request gitlab-org/gitlab-ce!28263
| * | | | Add Tomo Dote to Japanese proofreaderfu7mu42019-05-111-0/+1
| | | | |
* | | | | Merge branch 'revert-c5a9bc17' into 'master'Yorick Peterse2019-05-209-153/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'" See merge request gitlab-org/gitlab-ce!28483
| * | | | | Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'"revert-c5a9bc17Ryan Cobb2019-05-209-153/+29
| | |/ / / | |/| | | | | | | | This reverts merge request !27474
* | | | | Merge branch 'fl-fix-next-flag-for-good' into 'master'Phil Hughes2019-05-203-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Next badge must be visible when canary flag is true See merge request gitlab-org/gitlab-ce!28478
| * | | | | Next badge must be visible when canary flag is truefl-fix-next-flag-for-goodFilipa Lacerda2019-05-203-2/+7
| | | | | |
* | | | | | Merge branch '59313-mandatory-window-params' into 'master'Jan Provaznik2019-05-202-13/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require time window params in metrics dashboard Closes #59313 See merge request gitlab-org/gitlab-ce!28194
| * | | | | | Require time window params in metrics dashboardSarah Yasonik2019-05-202-13/+10
|/ / / / / /
* | | | | | Merge branch 'ci_age_based_runner_priority' into 'master'Nick Thomas2019-05-207-1/+58
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Added filtering jobs by age to jobs/request API endpoint See merge request gitlab-org/gitlab-ce!28034
| * | | | | Added filtering jobs by age to jobs/request API endpointDmitry Chepurovskiy2019-05-207-1/+58
|/ / / / /
* | | | | Merge branch 'fix-typo' into 'master'60879-test-analyzer-run-timeout-defaultDouglas Barbosa Alexandre2019-05-2032-42/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in the whole gitlab-ce project See merge request gitlab-org/gitlab-ce!28395
| * | | | | Fix typos in the whole gitlab-ce projectYoginth2019-05-2032-42/+42
|/ / / / /
* | | | | Merge branch 'po-gitaly-wrapper-proc' into 'master'Kamil Trzciński2019-05-202-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Gitaly to v1.42.1 See merge request gitlab-org/gitlab-ce!28425
| * | | | | Update Gitaly to v1.42.1Paul Okstad2019-05-202-1/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This version of Gitaly fixes a bug in gitaly-wrapper that prevented the proper detection of the executable path for a Gitaly process.
* | | | | Merge branch '60818_yamllint_project_root' into 'master'Kamil Trzciński2019-05-204-32/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #60818 Correct linting for project root *.yml files See merge request gitlab-org/gitlab-ce!27579
| * | | | | #60818 Correct linting for project root *.yml filesWill Hall2019-05-204-32/+37
|/ / / / /
* | | | | Merge branch '49517-fix-notes-import-export' into 'master'Mayra Cabrera2019-05-203-2/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include type to notes import / export Closes #49517 See merge request gitlab-org/gitlab-ce!28401
| * | | | | Include type to notes import / export49517-fix-notes-import-exportHeinrich Lee Yu2019-05-173-2/+12
| | | | | |
* | | | | | Merge branch 'qa-retry-in-ci-only' into 'master'Sanad Liaquat2019-05-201-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only retry failing QA tests in CI See merge request gitlab-org/gitlab-ce!28163
| * | | | | | Only retry failing QA tests in CIqa-retry-in-ci-onlyMark Lapierre2019-05-201-3/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | No need to retry automatically when running tests locally
* | | | | | Merge branch 'display-junit-classname-in-modal' into 'master'Kushal Pandya2019-05-206-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display classname JUnit attribute in report modal See merge request gitlab-org/gitlab-ce!28376
| * | | | | | Display classname JUnit attribute in report modalFabio Pitino2019-05-206-0/+17
|/ / / / / /
* | | | | | Merge branch 'winh-issue-boards-vuex-store' into 'master'Phil Hughes2019-05-208-0/+363
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create empty Vuex store for issue boards Closes #61622 See merge request gitlab-org/gitlab-ce!28229
| * | | | | | Create empty Vuex store for issue boardsWinnie Hellmann2019-05-208-0/+363
|/ / / / / /
* | | | | | Merge branch 'kinolaev-master-patch-13154' into 'master'Grzegorz Bizon2019-05-203-1/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Auto-DevOps: allow to disable rollout status check See merge request gitlab-org/gitlab-ce!28130