summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* added missing specsmulti-editor-store-specsPhil Hughes2017-11-102-1/+212
|
* fixed specsPhil Hughes2017-11-102-39/+13
|
* file action specsPhil Hughes2017-11-101-1/+349
|
* file action specsPhil Hughes2017-11-101-0/+44
|
* tree actions specsPhil Hughes2017-11-102-5/+452
|
* test updatesPhil Hughes2017-11-104-172/+121
|
* Added tests to multi-file Vuex storePhil Hughes2017-11-1012-11/+934
|
* Merge branch 'rc/gitlab-qa-89' into 'master'Grzegorz Bizon2017-11-1010-21/+40
|\ | | | | | | | | Change Page::Main::Entry to only visit an entrypoint and introduce Page::Main::Login to handle actual log-in See merge request gitlab-org/gitlab-ce!15283
| * Escape the password for Git callsRé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-20/+39
| | | | | | | | | | | | Page::Main::Login to handle actual log-in Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'Yorick Peterse2017-11-102-1/+19
|\ \ | | | | | | | | | | | | | | | | | | Fix another timeout when searching for pipelines Closes #39054 See merge request gitlab-org/gitlab-ce!15322
| * | Fix another timeout when searching for pipelinesSean McGivern2017-11-102-1/+19
| |/ | | | | | | | | | | | | | | | | When we consider 'all' pipelines for MRs, we now mean: 1. The last 10,000 commits (unordered). 2. From the last 100 MR versions (newest first). This seems to fix the MRs that time out on GitLab.com.
* | Merge branch 'winh-update-licenses-10-2' into 'master'Oswaldo Ferreira2017-11-101-23/+205
|\ \ | | | | | | | | | | | | Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318
| * | Update licenses for 10.2winh-update-licenses-10-2Winnie Hellmann2017-11-101-23/+205
| | |
* | | Merge branch 'winh-installation-10-2-stable-docs' into 'master'Oswaldo Ferreira2017-11-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Update installation.md to 10-2-stable See merge request gitlab-org/gitlab-ce!15315
| * | | 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.2 See merge request gitlab-org/gitlab-ce!15317
| * | | | 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 required Closes #39773 See merge request gitlab-org/gitlab-ce!15296
| * | | | 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 migration Closes gitaly#681 See merge request gitlab-org/gitlab-ce!14897
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status