GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2016-11-07T19:26:17Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/161Re-introduce "Send email to users" link in Admin area2016-11-07T19:26:17ZRobert SpeicherRe-introduce "Send email to users" link in Admin areaThis link was mistakenly removed during a CE-to-EE merge. We've added a
view spec to ensure it doesn't happen again!
Closes gitlab-org/gitlab-ee#222This link was mistakenly removed during a CE-to-EE merge. We've added a
view spec to ensure it doesn't happen again!
Closes gitlab-org/gitlab-ee#2228.4Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/162Improve error message for prohibited filenames2016-11-07T19:30:23ZGabriel MazettoImprove error message for prohibited filenamesWill fix #202Will fix #2028.5Drew BlessingDrew Blessinghttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/163Fix Jenkins service regression where category was incorrectly set to "common"2016-11-07T19:30:21ZDrew BlessingFix Jenkins service regression where category was incorrectly set to "common"Fixes #263
Migrate `JenkinsService` and `JenkinsDeprecatedService` so they are correctly categorized as `ci` services again.
This prevented the deprecated service from correctly showing the build status on merge requests.Fixes #263
Migrate `JenkinsService` and `JenkinsDeprecatedService` so they are correctly categorized as `ci` services again.
This prevented the deprecated service from correctly showing the build status on merge requests.8.4Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/164Keep track of audit event's author even when author user was deleted2016-11-07T19:30:21Zusername-removed-283999douglas@gitlab.comKeep track of audit event's author even when author user was deletedFixes #252 Fixes #252 username-removed-283999douglas@gitlab.comusername-removed-283999douglas@gitlab.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/165Fix elasticsearch indexing for newly created snippets2016-11-20T11:18:43ZValery SizovFix elasticsearch indexing for newly created snippets8.5Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/166CE upstream2016-11-07T19:30:22ZValery SizovCE upstreamUnresolved conflicts
```
both modified: app/controllers/omniauth_callbacks_controller.rb
both modified: app/views/shared/issuable/_sidebar.html.haml
```Unresolved conflicts
```
both modified: app/controllers/omniauth_callbacks_controller.rb
both modified: app/views/shared/issuable/_sidebar.html.haml
```8.5Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/167ES: Make elastic indexer more stable2016-11-28T16:52:45ZValery SizovES: Make elastic indexer more stable8.4Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/168Correct API documentation for Project Git Hooks endpoint2016-11-07T19:30:51Zusername-removed-399528Correct API documentation for Project Git Hooks endpointThis documentation update is meant to mirror the change that occurred in b85b1f2690970aa9ed38d49166dcec90b26a1b17 and 2ff68bfc2379bfbdc5a4f7cc9d9c10cae3c0cd79. These changes use the singular form of `Git Hook`.
Fixes: #38This documentation update is meant to mirror the change that occurred in b85b1f2690970aa9ed38d49166dcec90b26a1b17 and 2ff68bfc2379bfbdc5a4f7cc9d9c10cae3c0cd79. These changes use the singular form of `Git Hook`.
Fixes: #38https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/169Document EE Requirement for Jenkins Integration2017-06-06T13:45:07Zusername-removed-400297Document EE Requirement for Jenkins IntegrationClarified EE requirement for Jenkins Integration, added reference to GitLab CI for CE. Formatted document and clarified implementation steps.Clarified EE requirement for Jenkins Integration, added reference to GitLab CI for CE. Formatted document and clarified implementation steps.Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/170Update gitlab-elasticsearch-git2016-11-07T19:30:22ZValery SizovUpdate gitlab-elasticsearch-git8.4Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/171Added upgrading guide from 8.5 CE to EE2016-11-07T19:30:22Zyorickpeterse-stagingAdded upgrading guide from 8.5 CE to EE8.5username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/172Improve weight filter for issues2016-11-07T19:30:30ZJames LopezImprove weight filter for issuesAdds options: Any, No weight and Everything.
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/274Adds options: Any, No weight and Everything.
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/2748.6Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/173Added support for configuring Pages CNAME and TLS Certificates2017-01-05T18:51:59ZKamil TrzcińśkiAdded support for configuring Pages CNAME and TLS CertificatesPreliminary implementation with all expected features that will ship with this feature.
What is supported:
- Multiple domains per-project
- One certificate per-domain
- Validation of certificate
- Validation of certificate chain (solve...Preliminary implementation with all expected features that will ship with this feature.
What is supported:
- Multiple domains per-project
- One certificate per-domain
- Validation of certificate
- Validation of certificate chain (solves a problem with missing intermediates)
- Validation of private key against certificate
- Support for Pages Daemon (the shared/pages/group/project/config.json) that will be read by daemon
Plans for enhancements:
- [x] Write behavior and unit tests
- [x] Make the UI nicer
/cc @grzesiek @DouweM @sytses @rspeicher @marin @jacobvosmaerKamil TrzcińśkiKamil Trzcińśkihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/174Merge CE master into EE master2016-02-10T15:14:55Zyorickpeterse-stagingMerge CE master into EE masterThis merges CE master (up until commit 17240f80cb11a0721da1416ecf38acc7aae9bccd) into EE master.
@ayufan: I think I managed to resolve the conflicts in the Ability class properly, could you double check just to be sure? Also I had to ...This merges CE master (up until commit 17240f80cb11a0721da1416ecf38acc7aae9bccd) into EE master.
@ayufan: I think I managed to resolve the conflicts in the Ability class properly, could you double check just to be sure? Also I had to resolve some conflicts in `app/views/projects/edit.html.haml` regarding mirroring/project builds, could you check if the view still has everything in the correct order?Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/175Merge CE master into EE master (bis)2016-11-07T19:30:22Zusername-removed-128633Merge CE master into EE master (bis)This merges CE master (up until commit 10aa99a) into EE master.
@ayufan: I think I managed to resolve the conflicts in the Ability class properly, could you double check just to be sure? Also I had to resolve some conflicts in app/vie...This merges CE master (up until commit 10aa99a) into EE master.
@ayufan: I think I managed to resolve the conflicts in the Ability class properly, could you double check just to be sure? Also I had to resolve some conflicts in app/views/projects/edit.html.haml regarding mirroring/project builds, could you check if the view still has everything in the correct order?
/cc @yorickpeterse 8.5Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/176Fix EE builds2016-11-07T19:30:23ZKamil TrzcińśkiFix EE buildsIf we specify a new `services` in context of `job` we need to specify all used services, because they overwrite what is specified in global context.
It did not fail for some builds, because we still have mixed infrastructure: Some run...If we specify a new `services` in context of `job` we need to specify all used services, because they overwrite what is specified in global context.
It did not fail for some builds, because we still have mixed infrastructure: Some runners do have pre-configured mysql, postgres and redis in their environment.
All future runners will be migrated to drop the pre-configured services.
/cc @vsizov
8.5Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/177Improved LDAP documentation about the use of multiple servers [ci skip]2016-11-07T19:30:23ZPatricio CanoImproved LDAP documentation about the use of multiple servers [ci skip]cc @ernstvncc @ernstvn8.5Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/178Remove deprecated SSL warning on web hooks documentation2016-11-07T19:30:22ZAchilleas PipinellisRemove deprecated SSL warning on web hooks documentationCloses https://gitlab.com/gitlab-org/gitlab-ee/issues/289Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/2898.5Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/179Repository synchronization between primary and secondary nodes2016-09-26T16:30:16ZGabriel MazettoRepository synchronization between primary and secondary nodesImplement repository synchronization for Gitlab Geo: #76
- [x] pushes on primary node should notify secondaries
- [x] primary node should buffer notification and send them in batches
- [x] primary node should pool regularly notificatio...Implement repository synchronization for Gitlab Geo: #76
- [x] pushes on primary node should notify secondaries
- [x] primary node should buffer notification and send them in batches
- [x] primary node should pool regularly notification queue and notify secondaries in batches
- [x] API endpoint to receive batched notification to update projects
- [x] secondary nodes should not accept push from anyone
- [x] geo nodes should have own ssh keys to be able to sync repositories
- [x] secondary nodes should fetch repositories from primary
- [x] admin screen to manage geo nodes8.5Gabriel MazettoGabriel Mazettohttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/180Hide the info mentioning the linked LDAP groups if you are not logged in.2016-11-07T19:30:24ZPatricio CanoHide the info mentioning the linked LDAP groups if you are not logged in.As mentioned by a customer here: https://gitlab.zendesk.com/agent/tickets/15466
When a group contains public projects, it is possible to get at it's members without being logged in, **but** this page also leaks information if it is sy...As mentioned by a customer here: https://gitlab.zendesk.com/agent/tickets/15466
When a group contains public projects, it is possible to get at it's members without being logged in, **but** this page also leaks information if it is synched with LDAP. The `DN` of the linked groups will be shown:
![Screen_Shot_2016-02-12_at_5.16.29_PM](/uploads/f5339db6c1a57e4cb7f1ef0e323e0604/Screen_Shot_2016-02-12_at_5.16.29_PM.png)
This MR fixes that in that it only shows that information if the user is logged in.
/cc @DouweM 8.5Robert SpeicherRobert Speicher