home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,321 Commits 48 Branches 340 Tags
3d9a7cdb4be6d6d059dfd7ccc8fa2e4bd3ab12e3
Commit Graph
19321 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 3d9a7cdb4b Refactor CI helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:26:40 +02:00
Dmitriy Zaporozhets 87240e989b Move CI project settings page to CE project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:07:44 +02:00
Dmitriy Zaporozhets 2c3355f958 Merge branch 'ci-commits-to-projects' into 'master' 
Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455
 2015-09-29 11:44:07 +00:00
Dmitriy Zaporozhets bdf4668586 Merge branch 'move-triggers-page' into 'master' 
Move CI triggers page to project settings area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

See merge request !1461
 2015-09-29 11:43:27 +00:00
Jacob Vosmaer 958af6f5c2 Merge branch 'master' into 'master' 
Add support for AWS S3 Server-Side Encryption support

This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console.

## Points to double check
I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages

I also think I've managed to catch all of the documentation for this change as well.

### Why is this required
Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of.

Relates to issue #2478.


See merge request !1280
 2015-09-29 10:31:42 +00:00
Kamil Trzcinski 0d877d91e7 Make ensure_gitlab_ci_project return ci_project or create a new one 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 9498a40052 Fix migrations 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0f3deac362 Fix tests 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0fa4ab5fd8 Rename commits to ci_commits 2015-09-29 10:47:04 +02:00
Kamil Trzcinski e60647f011 Fix rubocop 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 8f8efcfa00 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 2c1f7ccac8 Fix register_build_service tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 6abca12847 Revert check_enable_flag! changes 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 3031209b07 Fix db/schema.rb 2015-09-29 10:47:03 +02:00
Kamil Trzcinski f88d9cee0f Fix migrations 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 0e33814708 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 1530f68c98 WIP 2015-09-29 10:47:03 +02:00
Dmitriy Zaporozhets 2a0d4e7200 Move CI triggers page to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 10:37:31 +02:00
Douwe Maan e1b7fcedfb Merge branch 'doc-omniauth-ldap-limitations' into 'master' 
Documentation of omniauth-ldap limitations

Further documentation about limitations directly impacting settings of
users' LDAP servers.

Closes #2613

See merge request !1421
 2015-09-29 07:47:42 +00:00
Douwe Maan 084e35527c Merge branch 'orphaned-repo-cleanup' into 'master' 
Improve repo cleanup task

I accidentally wrote a new script, not seeing we already had one.
But the old one did not do enough (it only handled global namespace orhpans) so I figured I should just drop in the new script.

See merge request !1298
 2015-09-29 07:35:59 +00:00
Dmitriy Zaporozhets 230d6c8783 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-29 09:29:59 +02:00
Dmitriy Zaporozhets 3c997218f6 Merge branch 'projects' into 'master' 
page-title-fix

Fixed .page-title margin

See merge request !1458
 2015-09-29 07:29:07 +00:00
Dmitriy Zaporozhets 679667d6df Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-29 09:29:05 +02:00
Dmitriy Zaporozhets ada95df88e Merge branch 'move-variables-page' into 'master' 
Move CI variables page to project settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

See merge request !1457
 2015-09-29 07:28:07 +00:00
Douwe Maan 231ee19c81 Merge branch 'krb_auth_helper_ce' into 'master' 
Remove 'kerberos' from auth_helper.rb for gitlab-CE.

There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510).

@DouweM suggested I send in this merge request.

See merge request !1430
 2015-09-29 07:27:08 +00:00
Sytse Sijbrandij 096bb561fc Merge branch 'linktoee' into 'master' 
note about EE git hooks

Because of https://gitlab.com/gitlab-com/www-gitlab-com/issues/415#note_2131220

See merge request !1934
 2015-09-29 05:40:03 +00:00
Robert Speicher 5b7e491c39 Update CHANGELOG for 8.0.3 
[ci skip]
 2015-09-28 22:57:52 -04:00
karen Carias 44b8844122 changed words 2015-09-28 19:04:32 -07:00
Andrey 59582aae57 page-title-fix 2015-09-28 17:58:30 +02:00
Dmitriy Zaporozhets 037defc7de Move CI variables page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 17:19:20 +02:00
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Dmitriy Zaporozhets d8e631c1e5 Merge branch 'cyrillic-font' into 'master' 
Update Source Sans Pro font: adds support for cyrillic characters

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #2764

See merge request !1454
 2015-09-28 14:20:28 +00:00
Douwe Maan 10c036fcf5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-28 15:43:27 +02:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Dmitriy Zaporozhets 145d933880 Merge branch 'projects' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 13:42:41 +02:00
Andrey ad67912760 !important removed from pre 2015-09-28 12:03:41 +02:00
Andrey ce49e49bfb edit action allign 2015-09-28 11:26:42 +02:00
Dmitriy Zaporozhets 74bdd67f21 Update Source Sans Pro font: adds support for cyrillic characters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 11:12:03 +02:00
Dmitriy Zaporozhets c876bfa0f2 Add missing spec file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 11:01:45 +02:00
Dmitriy Zaporozhets ac34ce8648 Merge branch 'add-activity-dashboard-preference' into 'master' 
Add user preference to view project activity and starred project activity as default dashboard

Screenshot:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5e39fa66da50e01dd9ed1c8a9ce01ea9/image.png)

Closes #2662

See merge request !1446
 2015-09-28 08:23:59 +00:00
Dmitriy Zaporozhets 92f8e0fd7e Finish move of runners page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 10:14:53 +02:00
Stan Hu e86e87fa71 Merge pull request #9669 from aaronsnyder/admin-labels-grammar 
Fix grammar in admin area labels when no labels exist
 2015-09-26 16:15:47 -07:00
Stan Hu e2016ba367 Merge branch 'patch-1' into 'master' 
Fixed grammar on Using Docker Build doc.



See merge request !1448
 2015-09-26 23:13:10 +00:00
Cyriac Thomas 05f29a5cb3 Simplified sentence as per @stanhu's note 2015-09-26 19:37:55 +00:00
Aaron Snyder a9cfa6c508 Fix grammar in admin area labels .nothing-here-block when no labels exist. 
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
 2015-09-26 11:25:26 -07:00
Cyriac Thomas 922c635b67 Fixed grammar on Using Docker Build doc. 2015-09-26 18:15:58 +00:00
Stan Hu 0383afc66a Add user preference to view project activity and starred project activity as default dashboard 
Closes #2662
 2015-09-26 08:46:05 -07:00
Stan Hu 6d69181059 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2015-09-25 16:47:33 -07:00
Stan Hu 4957415e00 Merge pull request #9650 from szechyjs/fb-close-comment 
FogBugz Import: Include closed comments since they may contain user data
 2015-09-25 16:46:50 -07:00