summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add no-op license helper to CE6539-extract-ee-specific-codeAlexandru Croitor2019-03-283-0/+10
| | | | | | | | Add no-op license helper to CE to make it compatible with EE codebase. Helper will be overwritten in EE to allow for CE specs to be run under EE codebase. https://gitlab.com/gitlab-org/gitlab-ee/issues/6539
* Merge branch 'docs-ci-examples-devops_and_game_dev_with_gitlab_ci_cd' into ↵Achilleas Pipinellis2019-03-201-9/+9
|\ | | | | | | | | | | | | 'master' Update 'DevOps and Game Dev with GitLab CI/CD' doc See merge request gitlab-org/gitlab-ce!25944
| * Update 'DevOps and Game Dev with GitLab CI/CD' docTakuya Noguchi2019-03-111-9/+9
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch ↵Fatih Acet2019-03-201-2/+3
|\ \ | | | | | | | | | | | | | | | | | | '6774-admin-dashboard-users-statistics-link-should-be-placed-differently' into 'master' Backport of Admin Dashboard "Users Statistics" link should be placed differently See merge request gitlab-org/gitlab-ce!26192
| * | Move User Statistics link into a button groupBrett Walker2019-03-141-2/+3
| | |
* | | Merge branch 'jramsay/dedupe-beta-docs' into 'master'Achilleas Pipinellis2019-03-201-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Add beta caution to hashed object pools See merge request gitlab-org/gitlab-ce!26289
| * | | Add beta caution to hashed object poolsJames Ramsay2019-03-201-0/+5
|/ / /
* | | Merge branch 'docs/fix-note-lists' into 'master'Achilleas Pipinellis2019-03-2021-18/+35
|\ \ \ | | | | | | | | | | | | | | | | Fix note lists throughout docs See merge request gitlab-org/gitlab-ce!26346
| * | | Fix note lists throughout docsEvan Read2019-03-2021-18/+35
|/ / /
* | | Merge branch 'ce-avoid_es_loading_commits' into 'master'Nick Thomas2019-03-201-1/+8
|\ \ \ | | | | | | | | | | | | | | | | Backport of avoid_es_loading_commits See merge request gitlab-org/gitlab-ce!26301
| * | | Backport of avoid_es_loading_commitsMario de la Ossa2019-03-191-1/+8
| | | |
* | | | Merge branch 'ce-6571-single-codebase' into 'master'Rémy Coutable2019-03-201-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE-port of 6571-single-codebase See merge request gitlab-org/gitlab-ce!26355
| * | | | CE-port of 6571-single-codebaseHeinrich Lee Yu2019-03-201-0/+11
| | | | | | | | | | | | | | | | | | | | Adds conditional to close assignee menu when visible in EE
* | | | | Merge branch '58883-fix-fetching-comments' into 'master'Fatih Acet2019-03-205-11/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize discussionFilter after notesApp Closes #58883 See merge request gitlab-org/gitlab-ce!26092
| * | | | | Initialize discussion filter after notes appHeinrich Lee Yu2019-03-195-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | Also sets default selectedValue for discussion filter when not logged in
* | | | | | Merge branch '10533-blank-css' into 'master'Phil Hughes2019-03-201-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for blank.scss Closes gitlab-ee#10533 See merge request gitlab-org/gitlab-ce!26354
| * | | | | | Removes EE differences for blank.scssFilipa Lacerda2019-03-201-0/+28
| | | | | | |
* | | | | | | Merge branch '10532-common-css' into 'master'Phil Hughes2019-03-201-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences from common.scss Closes gitlab-ee#10532 See merge request gitlab-org/gitlab-ce!26352
| * | | | | | | Removes EE differences from common.scssFilipa Lacerda2019-03-201-1/+5
| |/ / / / / /
* | | | | | | Merge branch ↵Robert Speicher2019-03-201-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ee-6516-extract-ee-specific-files-lines-for-spec-models-project_services' into 'master' Tweak kubernetes_service_spec for EE compatibility Closes gitlab-ee#6516 See merge request gitlab-org/gitlab-ce!26155
| * | | | | | | Tweak kubernetes_service_spec for EE compatibilityTiger2019-03-151-2/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '10520-builds-css' into 'master'Phil Hughes2019-03-201-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for builds.css Closes gitlab-ee#10520 See merge request gitlab-org/gitlab-ce!26351
| * | | | | | | Removes EE differences for builds.cssFilipa Lacerda2019-03-201-1/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '10517-pipelines-css' into 'master'Phil Hughes2019-03-201-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for pipelines.scss Closes gitlab-ee#10517 See merge request gitlab-org/gitlab-ce!26350
| * | | | | | | Removes EE differences for pipelines.scssFilipa Lacerda2019-03-201-2/+4
| |/ / / / / /
* | | | | | | Merge branch 'force-notification-to-saml-email' into 'master'James Lopez2019-03-205-16/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | CE backport of forcing sending notifications to saml provided email See merge request gitlab-org/gitlab-ce!25739
| * | | | | | CE backport of forcing sending notifications to saml provided emailGosia Ksionek2019-03-205-16/+28
|/ / / / / /
* | | | | | Merge branch ↵Filipa Lacerda2019-03-203-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58410-change-pixel-size-of-instance-header-footer-message-to-16px' into 'master' Reduce height of instance system message Closes #58410 See merge request gitlab-org/gitlab-ce!25752
| * | | | | | Reduce height of instance system messageDennis Tang2019-03-053-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reduces height of instance system header and footer to 16px - Pulls the system message up to better fit the container
* | | | | | | Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'Kushal Pandya2019-03-204-85/+162
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move gfm_autocomplete_spec.rb out of quarantine Closes #57995 and #56843 See merge request gitlab-org/gitlab-ce!25958
| * | | | | | Add getJSONFixture() helper to JestWinnie Hellmann2019-03-113-3/+27
| | | | | | |
| * | | | | | Increase timeout for gfm_auto_complete_spec.jsWinnie Hellmann2019-03-111-0/+4
| | | | | | |
| * | | | | | Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'Phil Hughes2019-03-114-85/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move gfm_autocomplete_spec.rb out of quarantine Closes #57995 and #56843 See merge request gitlab-org/gitlab-ce!25542 (cherry picked from commit 2dcbc0fa5657ab5c4ed46c5c84b8674faec36ea8)
* | | | | | | Merge branch 'do-not-force-2fa' into 'master'James Lopez2019-03-205-22/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional link to 2fa page See merge request gitlab-org/gitlab-ce!25731
| * | | | | | | Add additional link to 2fa pageGosia Ksionek2019-03-205-22/+60
|/ / / / / / /
* | | | | | | Merge branch 'docs-enable-disable-auto-devops-group-level' into 'master'Evan Read2019-03-191-2/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about Auto DevOps at group level Closes #58810 See merge request gitlab-org/gitlab-ce!26061
| * | | | | | | Add documentation about Auto Devops at group levelMayra Cabrera2019-03-191-2/+19
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a new section on our Auto Devops documentation about enabling or disabling Auto DevOps at group level. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58810
* | | | | | | Merge branch 'winh-remove-static-fixtures' into 'master'Mike Greiling2019-03-1945-210/+373
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove static JavaScript HAML fixtures Closes #24753 See merge request gitlab-org/gitlab-ce!26019
| * | | | | | | Do not delete files in spec/javascripts/fixtures/static/Winnie Hellmann2019-03-191-4/+0
| | | | | | | |
| * | | | | | | Remove static HAML fixtures from frontend testing guideWinnie Hellmann2019-03-192-6/+6
| | | | | | | |
| * | | | | | | Remove static JavaScript HAML fixturesWinnie Hellmann2019-03-1942-200/+367
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all HAML fixtures with the generated HTML files.
* | | | | | | | Merge branch 'only-counted-active-milestones-as-started' into 'master'Kamil Trzciński2019-03-195-2/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only count active milestones as started Closes #58782 See merge request gitlab-org/gitlab-ce!25969
| * | | | | | | | Only count active milestones as startedSean McGivern2019-03-195-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Upcoming milestone filter only considers active milestones, but the Started one included closed milestones, too. This was inconsistent.
* | | | | | | | | Merge branch 'docs_group_cluster_applications' into 'master'Evan Read2019-03-192-3/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: note some apps not installable in group level cluster See merge request gitlab-org/gitlab-ce!26249
| * | | | | | | | | Add cert-manager to group cluster docsThong Kuah2019-03-192-3/+17
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | As that is indeed available for group clusters.
* | | | | | | | | Merge branch 'sh-create-branch-as-project-owner-for-github-import' into 'master'Douglas Barbosa Alexandre2019-03-193-1/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub import: Create new branches as project owner See merge request gitlab-org/gitlab-ce!26335
| * | | | | | | | | GitHub import: Create new branches as project ownerStan Hu2019-03-193-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids permission errors when importing merge requests whose authors don't have direct access to push to the main repository.
* | | | | | | | | | Merge branch 'sh-reject-info-refs-head-requests' into 'master'Douglas Barbosa Alexandre2019-03-193-0/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject HEAD requests to info/refs endpoint Closes #54579 See merge request gitlab-org/gitlab-ce!26334
| * | | | | | | | | | Reject HEAD requests to info/refs endpointStan Hu2019-03-193-0/+25
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In production, we see high error rates due to clients attempting to use the dumb Git HTTP protocol with HEAD /foo/bar.git/info/refs endpoint. This isn't supported and causes Error 500s because Workhorse doesn't send along its secret because it's not proxying this request. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54579
* | | | | | | | | | Merge branch 'nfriend-update-pipeline-detail-view' into 'master'Kamil Trzciński2019-03-1910-16/+363
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipeline detail view to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25775