summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'winh-installation-10-2-stable-docs' into 'master'Oswaldo Ferreira2017-11-101-2/+2
|\
| * Update installation.md to 10-2-stablewinh-installation-10-2-stable-docswinh-installation-10-2-stableWinnie Hellmann2017-11-101-2/+2
* | Merge branch 'winh-templates-10-2' into 'master'Oswaldo Ferreira2017-11-103-3/+3
|\ \
| * | Update templates for 10.2winh-templates-10-2Winnie Hellmann2017-11-103-3/+3
* | | Merge branch 'issue_39773_be' into 'master'Sean McGivern2017-11-103-11/+43
|\ \ \
| * | | Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-103-11/+43
* | | | Merge branch 'gitlab-git-remote-repository' into 'master'Sean McGivern2017-11-106-56/+243
|\ \ \ \ | |/ / / |/| | |
| * | | Prepare Repository#fetch_source_branch for migrationJacob Vosmaer (GitLab)2017-11-106-56/+243
|/ / /
* | | Merge branch 'qa/gb/rspec-decouple-test-instance-address' into 'master'Rémy Coutable2017-11-105-45/+36
|\ \ \
| * | | 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 schema of the "issues" tablecleanup-issues-schemaYorick Peterse2017-11-0915-12/+257
* | | | | Merge branch 'qa/gb/fix-bootable-scenario-arguments' into 'master'Rémy Coutable2017-11-102-6/+4
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
| | |/ / / | |/| | |
* | | | | 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 propersh-use-non-superuser-dbStan Hu2017-11-094-1/+32
| |/ / /
* | | | Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-103-5/+34
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
| * | | Update CHANGELOG.md for 10.0.6Lin Jen-Shin2017-11-081-0/+4
| * | | Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-081-0/+4
* | | | Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'Stan Hu2017-11-092-5/+6
|\ \ \ \
| * | | | Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable'Stan Hu2017-11-091-0/+2
| * | | | Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-092-5/+4
|/ / / /
* | | | Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master'Fatih Acet2017-11-092-1/+21
|\ \ \ \
| * | | | 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 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 overkillmove-filter-mr-clear-search-spec-to-jsEric Eastwood2017-11-092-16/+19
* | | | | | | Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-091-4/+18
|\ \ \ \ \ \ \
| * | | | | | | 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 APIWinnie Hellmann2017-11-094-26/+230
|/ / / / / / / /