summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Escape the password for Git callsrc/gitlab-qa-89Rémy Coutable2017-11-101-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Change Page::Main::Entry to only visit an entrypoint and introduce ↵Rémy Coutable2017-11-109-19/+43
| | | | | | Page::Main::Login to handle actual log-in Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'qa/gb/rspec-decouple-test-instance-address' into 'master'Rémy Coutable2017-11-105-45/+36
|\ | | | | | | | | | | | | Decouple QA test subject's address from Capybara/RSpec Closes gitlab-qa#88 See merge request gitlab-org/gitlab-ce!15310
| * Fix Rubocop offense in QA scenario entrypointqa/gb/rspec-decouple-test-instance-addressGrzegorz Bizon2017-11-101-2/+0
| |
| * Refactor QA specs runners and improve specsGrzegorz Bizon2017-11-103-10/+14
| |
| * Improve QA test scenario entrypoint specsGrzegorz Bizon2017-11-101-7/+7
| |
| * Configure RSpec from within RSpec runner classGrzegorz Bizon2017-11-103-13/+7
| |
| * Do not require to set Capybara app_host in RSpecGrzegorz Bizon2017-11-103-19/+14
| |
| * Fix bootable scenario arguments for OptionParserGrzegorz Bizon2017-11-101-5/+3
| |
* | Merge branch 'cleanup-issues-schema' into 'master'Sean McGivern2017-11-1015-12/+257
|\ \ | | | | | | | | | | | | | | | | | | Clean up the schema of the table "issues" Closes #31811 See merge request gitlab-org/gitlab-ce!15225
| * | Clean up schema of the "issues" tablecleanup-issues-schemaYorick Peterse2017-11-0915-12/+257
| | | | | | | | | | | | | | | | | | | | | | | | This adds various foreign key constraints, indexes, missing NOT NULL constraints, and changes some column types from timestamp to timestamptz. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31811
* | | Merge branch 'qa/gb/fix-bootable-scenario-arguments' into 'master'Rémy Coutable2017-11-102-6/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix bootable scenario arguments for OptionParser See merge request gitlab-org/gitlab-ce!15309
| * | | Fix bootable scenario arguments for OptionParserGrzegorz Bizon2017-11-102-6/+4
|/ / /
* | | Merge branch '32059-fix-oauth-phishing' into 'master'Douwe Maan2017-11-106-7/+50
|\ \ \ | | | | | | | | | | | | | | | | Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab-org/gitlab-ce!15311
| * | | Add changelog entry for !220532059-fix-oauth-phishingkushalpandya2017-11-101-0/+6
| | | |
| * | | Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-105-7/+44
| | |/ | |/| | | | | | | | | | | | | Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab/gitlabhq!2205
* | | Merge branch 'sh-use-non-superuser-db' into 'master'Rémy Coutable2017-11-104-1/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use a non-superuser user to access GitLab to ensure permissions are proper Closes #39932 See merge request gitlab-org/gitlab-ce!15301
| * | | Use a non-superuser user to access GitLab to ensure permissions are propersh-use-non-superuser-dbStan Hu2017-11-094-1/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We have run into permission issues with MySQL triggers in #36633 that would have been caught earlier either if our migration tests or GitLab QA tests had been testing against non-superuser users. This change creates a non-superuser that has access to the GitLab test database and uses that. Closes #39932
* | | Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-103-5/+34
|\ \ \ | | | | | | | | | | | | | | | | Icon Sprite URL needs to be local even if asset_host is set See merge request gitlab-org/gitlab-ce!15289
| * | | Removed Bracketstz-no-cdn-for-svg-spritesTim Zallmann2017-11-091-1/+1
| | | |
| * | | Fixed Function + Test based on MRTim Zallmann2017-11-092-12/+9
| | | |
| * | | Missing the local urlTim Zallmann2017-11-091-2/+2
| | | |
| * | | Put Icons Path in HelperTim Zallmann2017-11-091-6/+9
| | | |
| * | | Fixed URL Matching in TestsTim Zallmann2017-11-091-6/+6
| | | |
| * | | Icon Sprite URL is also local even if asset_host is setTim Zallmann2017-11-093-2/+31
| | | |
* | | | Merge remote-tracking branch 'dev.gitlab.org/master'Winnie Hellmann2017-11-100-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Update CHANGELOG.md for 9.5.10Winnie Hellmann2017-11-081-0/+4
| | | | | | | | | | | | [ci skip]
| * | | Update CHANGELOG.md for 10.0.6Lin Jen-Shin2017-11-081-0/+4
| | | | | | | | | | | | [ci skip]
| * | | Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-081-0/+4
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'Stan Hu2017-11-092-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add 10.1.2 security fixes to CHANGELOG on master See merge request gitlab-org/gitlab-ce!15305
| * | | | Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable'Stan Hu2017-11-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Add 10.1.2 security fixes to CHANGELOG.md See merge request gitlab-org/gitlab-ce!15302
| * | | | Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-092-5/+4
|/ / / / | | | | | | | | [ci skip]
* | | | Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master'Fatih Acet2017-11-092-1/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Disable issue action button whilst submitting and test See merge request gitlab-org/gitlab-ce!15211
| * | | | Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmittingLuke "Jared" Bennett2017-11-062-1/+21
| | | | |
* | | | | Merge branch 'br-add-glossary' into 'master'Sid Sijbrandij2017-11-091-16/+133
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add glossary part 1 See merge request gitlab-org/gitlab-ce!15247
| * | | | | add glossary part 2br-add-glossaryBrittany Rohde2017-11-071-3/+3
| | | | | |
| * | | | | add glossary part 1Brittany Rohde2017-11-071-13/+130
| | | | | |
* | | | | | Merge branch 'move-filter-mr-clear-search-spec-to-js' into 'master'Tim Zallmann2017-11-092-16/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move clear search test to JS to reduce overkill See merge request gitlab-org/gitlab-ce!15154
| * | | | | | Move clear search test to JS to reduce overkillmove-filter-mr-clear-search-spec-to-jsEric Eastwood2017-11-092-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/33661
* | | | | | | Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-091-4/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve breadcrumbs clipping Closes #37920 See merge request gitlab-org/gitlab-ce!15164
| * | | | | | | Dynamically truncate breadcrumbs37920-improve-breadcrumbs-clippingAnnabel Dunstone Gray2017-11-081-3/+14
| | | | | | | |
| * | | | | | | Remove max-width on desktopAnnabel Dunstone Gray2017-11-081-1/+4
| | | | | | | |
* | | | | | | | Merge branch 'winh-subgroups-api' into 'master'Rémy Coutable2017-11-094-26/+230
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /groups/:id/subgroups endpoint to API Closes #32652 See merge request gitlab-org/gitlab-ce!15142
| * | | | | | | | Add /groups/:id/subgroups endpoint to APIWinnie Hellmann2017-11-094-26/+230
|/ / / / / / / /
* | | | | | | | Merge branch 'dm-avatarable-with-asset-host' into 'master'Rémy Coutable2017-11-098-131/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always return full avatar URL for private/internal groups/projects when asset host is set See merge request gitlab-org/gitlab-ce!15288
| * | | | | | | | Always return full avatar URL for private/internal groups/projects when ↵Douwe Maan2017-11-098-131/+82
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | asset host is set
* | | | | | | | Merge branch 'fix-todos-last-page' into 'master'Rémy Coutable2017-11-093-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix access to the final page of todos See merge request gitlab-org/gitlab-ce!15293
| * | | | | | | | Fix access to the final page of todosSean McGivern2017-11-093-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The todos page limit is 20, and both that and a user's pending todo count are integers. Using integer division means that the result's floor will be taken, defeating the point of the later call to `#ceil`. So we need to convert one side of the division to a float first, otherwise the last page won't be treated as available.
* | | | | | | | | Merge branch '39109-reenable-scroll-job' into 'master'Phil Hughes2017-11-092-26/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables scroll to bottom once user has scrolled back to bottom in job log Closes #34846 and #39109 See merge request gitlab-org/gitlab-ce!15260
| * | | | | | | | | Enables scroll to bottom once user has scrolled back to bottom in job logFilipa Lacerda2017-11-092-26/+29
|/ / / / / / / / /
View Lorry Controller Status