Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update Services API documentation for Kubernetes serviceupdate-services-api-docs-for-kubernetes | Athar Hameed | 2017-11-13 | 1 | -0/+35 |
| | |||||
* | Merge branch 'docs-40038-broken-link-on-projects-members-documentation-site' ↵ | Marcia Ramos | 2017-11-13 | 1 | -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 docs | Mark Fletcher | 2017-11-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master' | Tim Zallmann | 2017-11-12 | 2 | -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-open | Luke "Jared" Bennett | 2017-11-07 | 1 | -3/+1 |
| | | | | | | | | | | | | cause by only selecting elements for that dropdown instance | ||||
| * | | add feature spec to assert no linked filter inputs | Luke "Jared" Bennett | 2017-11-06 | 1 | -0/+22 |
| | | | |||||
| * | | Run filter method for filterable gl_dropdown instances | Luke "Jared" Bennett | 2017-11-06 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'qa/gb/fix-page-refresh-address' into 'master' | Grzegorz Bizon | 2017-11-11 | 1 | -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-address | Grzegorz Bizon | 2017-11-11 | 1 | -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.3 | Felipe Artur | 2017-11-10 | 14 | -67/+16 |
| | | | | | | | | | [ci skip] | ||||
* | | | Merge branch 'revert-2f644452' into 'master' | Mike Greiling | 2017-11-10 | 5 | -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 Schatz | 2017-11-10 | 5 | -76/+140 |
|/ / / | | | | | | | This reverts merge request !15264 | ||||
* | | | Merge branch 'winh-update-10-2-docs' into 'master' | Oswaldo Ferreira | 2017-11-10 | 1 | -0/+360 |
|\ \ \ | | | | | | | | | | | | | | | | | Add Update guide for 10.2 See merge request gitlab-org/gitlab-ce!15316 | ||||
| * | | | Add Update guide for 10.2 | Winnie Hellmann | 2017-11-10 | 1 | -0/+360 |
|/ / / | |||||
* | | | Merge branch 'rc/gitlab-qa-89' into 'master' | Grzegorz Bizon | 2017-11-10 | 10 | -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 calls | Rémy Coutable | 2017-11-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Change Page::Main::Entry to only visit an entrypoint and introduce ↵ | Rémy Coutable | 2017-11-10 | 9 | -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 Peterse | 2017-11-10 | 2 | -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 pipelines | Sean McGivern | 2017-11-10 | 2 | -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 Ferreira | 2017-11-10 | 1 | -23/+205 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318 | ||||
| * | | | | Update licenses for 10.2winh-update-licenses-10-2 | Winnie Hellmann | 2017-11-10 | 1 | -23/+205 |
| | | | | | |||||
* | | | | | Merge branch 'winh-installation-10-2-stable-docs' into 'master' | Oswaldo Ferreira | 2017-11-10 | 1 | -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-stable | Winnie Hellmann | 2017-11-10 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'winh-templates-10-2' into 'master' | Oswaldo Ferreira | 2017-11-10 | 3 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates for 10.2 See merge request gitlab-org/gitlab-ce!15317 | ||||
| * | | | | | | Update templates for 10.2winh-templates-10-2 | Winnie Hellmann | 2017-11-10 | 3 | -3/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'issue_39773_be' into 'master' | Sean McGivern | 2017-11-10 | 3 | -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_be | Felipe Artur | 2017-11-10 | 3 | -11/+43 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'gitlab-git-remote-repository' into 'master' | Sean McGivern | 2017-11-10 | 6 | -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 migration | Jacob Vosmaer (GitLab) | 2017-11-10 | 6 | -56/+243 |
|/ / / / / | |||||
* | | | | | Merge branch 'qa/gb/rspec-decouple-test-instance-address' into 'master' | Rémy Coutable | 2017-11-10 | 5 | -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-address | Grzegorz Bizon | 2017-11-10 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Refactor QA specs runners and improve specs | Grzegorz Bizon | 2017-11-10 | 3 | -10/+14 |
| | | | | | | |||||
| * | | | | | Improve QA test scenario entrypoint specs | Grzegorz Bizon | 2017-11-10 | 1 | -7/+7 |
| | | | | | | |||||
| * | | | | | Configure RSpec from within RSpec runner class | Grzegorz Bizon | 2017-11-10 | 3 | -13/+7 |
| | | | | | | |||||
| * | | | | | Do not require to set Capybara app_host in RSpec | Grzegorz Bizon | 2017-11-10 | 3 | -19/+14 |
| | | | | | | |||||
| * | | | | | Fix bootable scenario arguments for OptionParser | Grzegorz Bizon | 2017-11-10 | 1 | -5/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'cleanup-issues-schema' into 'master' | Sean McGivern | 2017-11-10 | 15 | -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-schema | Yorick Peterse | 2017-11-09 | 15 | -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 Coutable | 2017-11-10 | 2 | -6/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bootable scenario arguments for OptionParser See merge request gitlab-org/gitlab-ce!15309 | ||||
| * | | | | | | Fix bootable scenario arguments for OptionParser | Grzegorz Bizon | 2017-11-10 | 2 | -6/+4 |
|/ / / / / / | |||||
* | | | | | | Merge branch '32059-fix-oauth-phishing' into 'master' | Douwe Maan | 2017-11-10 | 6 | -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-phishing | kushalpandya | 2017-11-10 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch '32059-fix-oauth-phishing' into 'security-10-1' | Douwe Maan | 2017-11-10 | 5 | -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 Coutable | 2017-11-10 | 4 | -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-db | Stan Hu | 2017-11-09 | 4 | -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 Maan | 2017-11-10 | 3 | -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-sprites | Tim Zallmann | 2017-11-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed Function + Test based on MR | Tim Zallmann | 2017-11-09 | 2 | -12/+9 |
| | | | | | |||||
| * | | | | Missing the local url | Tim Zallmann | 2017-11-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Put Icons Path in Helper | Tim Zallmann | 2017-11-09 | 1 | -6/+9 |
| | | | | |