summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* wipweb-ide-new-filePaul Slaughter2019-03-193-11/+11
|
* Create temp entry in Web IDEFatih Acet2019-03-111-1/+3
|
* Merge branch 'mj/single-codebase-reviewers' into 'master'Marin Jankovski2019-03-113-1/+60
|\ | | | | | | | | Set specific reviewers for the single codebase effort See merge request gitlab-org/gitlab-ce!25804
| * Set specific reviewers for single codebase effortMarin Jankovski2019-03-113-1/+60
| | | | | | | | | | | | | | This extends Danger so it informs MR authors that single codebase merge requests need to be approved by a specific group of engineers. Co-authored-by: Yorick Peterse <yorickpeterse@gmail.com>
* | Merge branch 'sh-rugged-commit-tree-entry' into 'master'Douwe Maan2019-03-115-2/+50
|\ \ | | | | | | | | | | | | Bring back Rugged implementation of commit_tree_entry See merge request gitlab-org/gitlab-ce!25896
| * | Add back Rugged support for retrieving a commit tree entryStan Hu2019-03-085-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back some of the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20176/diffs. We discovered another N+1 that hits Gitaly `TreeEntry` via the `RelativeLinkFilter`: https://gitlab.com/gitlab-org/gitlab-ce/issues/58657. When a blob is loaded with many relative links, `TreeEntry` is called for each link to scan the URI type. There are multiple paths that hit Gitaly `TreeEntry`, and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25706 did not cover all cases. This commit covers another common use case. For users using Gitaly on top of NFS, accessing the Git data directly via Rugged may be faster than going through than Gitaly. This merge request introduces the feature flag `rugged_commit_tree_entry` to activate the Rugged method.
* | | Merge branch 'qa-ml-quarantine-context-refactor' into 'master'Rémy Coutable2019-03-115-401/+344
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Extract quarantine code and add tests Closes #57666 See merge request gitlab-org/gitlab-ce!25223
| * | Skip contexts in quarantineMark Lapierre2019-03-115-401/+344
|/ / | | | | | | This avoids running before/after blocks for tests that are in quarantine
* | Merge branch 'docs-patch-49' into 'master'Phil Hughes2019-03-111-2/+2
|\ \ | | | | | | | | | | | | Updates how to export the state object See merge request gitlab-org/gitlab-ce!25947
| * | Updates how to export the state objectFilipa Lacerda2019-03-101-2/+2
| | |
* | | Merge branch '7861-cross-project-pipeline-dashboard-mvc-ce-backport' into ↵Filipa Lacerda2019-03-111-0/+80
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport EE CSS addition See merge request gitlab-org/gitlab-ce!25874
| * | | Backport EE CSS additionScott Hampton2019-03-081-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | Adding the dashboard skeleton SCSS file to CE. [skip visual]
* | | | Merge branch '10081-env-table' into 'master'Phil Hughes2019-03-114-7/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces EE differences for environments table Closes gitlab-ee#10081 See merge request gitlab-org/gitlab-ce!25916
| * | | | Reduces EE differences for environments tableFilipa Lacerda2019-03-084-7/+65
| | | | | | | | | | | | | | | | | | | | | | | | | Async loads EE components Creates a Mixin for EE properties
* | | | | Merge branch 'winh-jest-synchronous-timeout' into 'master'Phil Hughes2019-03-112-16/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce setTestTimeout() for synchronous Jest tests Closes #58658 See merge request gitlab-org/gitlab-ce!25926
| * | | | | Add setTestTimeout for Jest testsWinnie Hellmann2019-03-082-16/+26
| |/ / / / | | | | | | | | | | | | | | | | | | | | Allows contributors to set the timeout for individual jest tests.
* | | | | Merge branch 'docs-redirects3' into 'master'Evan Read2019-03-1132-1/+129
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add automatic redirects to many moved files See merge request gitlab-org/gitlab-ce!25902
| * | | | | Docs: Add automatic redirects to many moved filesMarcel Amirault2019-03-1132-1/+129
|/ / / / /
* | | | | Merge branch 'docs-anchors12-chatops' into 'master'Evan Read2019-03-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix markdown for link in chatops doc See merge request gitlab-org/gitlab-ce!25952
| * | | | | Docs: Fix markdown for link in chatops docMarcel Amirault2019-03-111-1/+1
|/ / / / /
* | | | | Merge branch 'patch-48' into 'master'Evan Read2019-03-111-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add infos about runners concurrent jobs in .gitlab-ci.yml documentation See merge request gitlab-org/gitlab-ce!25809
| * | | | | Update README.mdvalentin bancarel2019-03-081-0/+6
| | | | | |
* | | | | | Merge branch 'docs-anchors6-ci' into 'master'Evan Read2019-03-1120-44/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix CI/CD related anchors See merge request gitlab-org/gitlab-ce!25591
| * | | | | | Docs: Fix CI/CD related anchorsMarcel Amirault2019-03-1120-44/+42
|/ / / / / /
* | | | | | Merge branch 'docs-auto-devops-deploy-token' into 'master'Evan Read2019-03-111-20/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clarify how Auto DevOps deploys using deploy token See merge request gitlab-org/gitlab-ce!25787
| * | | | | | Clarify how Auto DevOps deploys using deploy tokenThong Kuah2019-03-111-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were emphasising a point that's no longer true since we implemented deploy tokens in 11.0 so rationalize the docs here.
* | | | | | | Merge branch 'docs/53121-docs-feedback-runner-has-no-examples' into 'master'Evan Read2019-03-101-3/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipeline webhook example response Closes #53121 See merge request gitlab-org/gitlab-ce!25914
| * | | | | | | Update pipeline webhook example responseSteve Azzopardi2019-03-081-3/+18
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the example response we have builds with status `success` but the property `runner` is null, which is not a realistic representation of the response. The runner is always sent if the build has ran. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53121
* | | | | | | Merge branch '_acet-docs-update' into 'master'Robert Speicher2019-03-101-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Remove confusing author name from Changelog docs See merge request gitlab-org/gitlab-ce!25928
| * | | | | | Remove confusing author name from Changelog docsFatih Acet2019-03-081-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'more-pgroup-fix' into 'master'Stan Hu2019-03-103-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the last-ditch memory killer pgroup SIGKILL See merge request gitlab-org/gitlab-ce!25940
| * | | | | | Fix the last-ditch memory killer pgroup SIGKILLNick Thomas2019-03-093-2/+7
| | | | | | |
* | | | | | | Merge branch 'fix-error-msg-typo' into 'master'Nick Thomas2019-03-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Update cleanup.rake to fix a typo in the error message See merge request gitlab-org/gitlab-ce!25901
| * | | | | | Update cleanup.rake to fix a typo in the error messageRay Paik2019-03-071-1/+1
| | | | | | |
* | | | | | | Merge branch 'filter-merge-requests-by-target-branch' into 'master'Nick Thomas2019-03-0917-16/+204
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter merge requests by target branch See merge request gitlab-org/gitlab-ce!24380
| * | | | | | | Filter merge requests by target branchHiroyuki Sato2019-03-0917-16/+204
|/ / / / / / /
* | | | | | | Merge branch 'fix/email_validator' into 'master'Stan Hu2019-03-098-13/+141
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align EmailValidator to validate_email gem implementation. Closes #57352 See merge request gitlab-org/gitlab-ce!24971
| * | | | | | | Align EmailValidator to validate_email gem implementation.Horatiu Eugen Vlad2019-03-058-13/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed EmailValidator to DeviseEmailValidator to avoid 'email:' naming collision with ActiveModel::Validations::EmailValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: regex.
* | | | | | | | Merge branch 'mg-remove-select2-rails' into 'master'Marin Jankovski2019-03-083-5/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove select2-rails (select2 is now installed via yarn) See merge request gitlab-org/gitlab-ce!25929
| * | | | | | | | Remove select2-rails (select2 is now installed via yarn)Mike Greiling2019-03-083-5/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-fix-ci-intro-typos' into 'master'Mike Lewis2019-03-081-4/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Docs: intro to CI/CD - fix typos See merge request gitlab-org/gitlab-ce!25917
| * | | | | | | Docs: intro to CI/CD - fix typosMarcia Ramos2019-03-081-4/+4
|/ / / / / / /
* | | | | | | Merge branch 'winh-catch-docs-and-master' into 'master'Phil Hughes2019-03-081-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Skip gitlab:ui:visual job for docs again See merge request gitlab-org/gitlab-ce!25922
| * | | | | | Skip gitlab:ui:visual job for docs and masterWinnie Hellmann2019-03-081-1/+1
|/ / / / / /
* | | | | | Merge branch 'revert-d1960efd' into 'master'Phil Hughes2019-03-083-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'remove-select2-rails' into 'master'" See merge request gitlab-org/gitlab-ce!25920
| * | | | | | Revert "Merge branch 'remove-select2-rails' into 'master'"Marin Jankovski2019-03-083-1/+4
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !17871
* | | | | | | Merge branch '20084-update-the-spinner-component' into 'master'Fatih Acet2019-03-082-3/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix gl-loading-icon bug before gitlab-ui update See merge request gitlab-org/gitlab-ce!25683
| * | | | | | Fix gl-loading-icon bug before gitlab-ui updateBrandon Labuschagne2019-03-082-3/+2
|/ / / / / /
* | | | | | Merge branch 'sitcky-prefix-fix' into 'master'Filipa Lacerda2019-03-084-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed sticky bar styling in Safari Closes #58625 See merge request gitlab-org/gitlab-ce!25913
| * | | | | Fixed sticky bar styling in SafariPhil Hughes2019-03-084-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58625