summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix users autocomplete in a subgroupfix-subgroup-autocompleteSean McGivern2017-11-133-1/+21
| | | | | We should include users who have access from parent groups, not just direct members of the current group.
* Merge branch 'update-services-api-docs-for-kubernetes' into 'master'Douwe Maan2017-11-131-0/+35
|\ | | | | | | | | Update Services API documentation for Kubernetes service See merge request gitlab-org/gitlab-ce!15343
| * Update Services API documentation for Kubernetes serviceupdate-services-api-docs-for-kubernetesAthar Hameed2017-11-131-0/+35
| |
* | Merge branch 'text-utils' into 'master'Phil Hughes2017-11-1321-301/+326
|\ \ | |/ |/| | | | | | | | | Export text utils as ES6 modules Closes #40018 and #37851 See merge request gitlab-org/gitlab-ce!15320
| * Export text utils as ES6 modulesFilipa Lacerda2017-11-1321-301/+326
|/
* Merge branch 'docs-40038-broken-link-on-projects-members-documentation-site' ↵Marcia Ramos2017-11-131-1/+1
|\ | | | | | | | | | | | | | | | | into 'master' Fix permissions link for project member docs Closes #40038 See merge request gitlab-org/gitlab-ce!15325
| * Fix permissions link for project member docsMark Fletcher2017-11-101-1/+1
| |
* | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master'Tim Zallmann2017-11-122-1/+23
|\ \ | | | | | | | | | | | | | | | | | | Clear filter on gl_dropdown open Closes #39564 See merge request gitlab-org/gitlab-ce!15214
| * | Change fix, instead of hacking in a filter clear every time, fix the root ↵39564-clear-filter-on-gitlab-dropdown-openLuke "Jared" Bennett2017-11-071-3/+1
| | | | | | | | | | | | cause by only selecting elements for that dropdown instance
| * | add feature spec to assert no linked filter inputsLuke "Jared" Bennett2017-11-061-0/+22
| | |
| * | Run filter method for filterable gl_dropdown instancesLuke "Jared" Bennett2017-11-061-0/+2
| | |
* | | Merge branch 'qa/gb/fix-page-refresh-address' into 'master'Grzegorz Bizon2017-11-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix QA page refresh address by using absolute URLs Closes gitlab-qa#99 See merge request gitlab-org/gitlab-ce!15338
| * | | Fix QA page refresh address by using absolute URLsqa/gb/fix-page-refresh-addressGrzegorz Bizon2017-11-111-1/+1
|/ / / | | | | | | | | | | | | | | | This makes QA page refresh address to be absolute URL since we dropped `Capybara.app_host`, thus there is no support for relative URLs with `visit` now.
* | | Update CHANGELOG.md for 10.1.3Felipe Artur2017-11-1014-67/+16
| | | | | | | | | [ci skip]
* | | Merge branch 'revert-2f644452' into 'master'Mike Greiling2017-11-105-76/+140
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'add-typescript' into 'master'" See merge request gitlab-org/gitlab-ce!15327
| * | | Revert "Merge branch 'add-typescript' into 'master'"Jacob Schatz2017-11-105-76/+140
|/ / / | | | | | | This reverts merge request !15264
* | | Merge branch 'winh-update-10-2-docs' into 'master'Oswaldo Ferreira2017-11-101-0/+360
|\ \ \ | | | | | | | | | | | | | | | | Add Update guide for 10.2 See merge request gitlab-org/gitlab-ce!15316
| * | | Add Update guide for 10.2Winnie Hellmann2017-11-101-0/+360
|/ / /
* | | 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
View Lorry Controller Status