delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	WIP	Kamil Trzcinski	2015-09-29	7	-6/+43
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'move-triggers-page' into 'master'	Dmitriy Zaporozhets	2015-09-29	9	-60/+53
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move CI triggers page to project settings area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1461
\| * \| \|	Move CI triggers page to project settings areamove-triggers-page	Dmitriy Zaporozhets	2015-09-29	9	-60/+53
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'master' into 'master'	Jacob Vosmaer	2015-09-29	5	-17/+24
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Add support for AWS S3 Server-Side Encryption support	Paul Beattie	2015-09-25	5	-17/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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. This is optional and not required to make S3 uploads work.
* \| \|	Merge branch 'doc-omniauth-ldap-limitations' into 'master'	Douwe Maan	2015-09-29	1	-0/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation of omniauth-ldap limitations Further documentation about limitations directly impacting settings of users' LDAP servers. Closes #2613 See merge request !1421
\| * \| \|	Documentation of omniauth-ldap limitations	Julio	2015-09-24	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Further documentation about limitations directly impacting settings of users' LDAP servers.
* \| \| \|	Merge branch 'orphaned-repo-cleanup' into 'master'	Douwe Maan	2015-09-29	2	-35/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Improve 'rake gitlab:cleanup:repos' documentationorphaned-repo-cleanup	Jacob Vosmaer	2015-09-25	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Guard against trailing slashes in repos_path	Jacob Vosmaer	2015-09-15	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Improve repo cleanup task	Jacob Vosmaer	2015-09-15	1	-34/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up more than just global (legacy) repos. Also, instead of deleting, just rename.
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-09-29	2	-1/+8
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'projects' into 'master'	Dmitriy Zaporozhets	2015-09-29	2	-1/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page-title-fix Fixed .page-title margin See merge request !1458
\| \| * \| \| \| \|	page-title-fix	Andrey	2015-09-28	2	-1/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-09-29	11	-58/+48
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'move-variables-page' into 'master'	Dmitriy Zaporozhets	2015-09-29	10	-57/+47
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move CI variables page to project settings Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1457
\| \| * \| \| \| \| \|	Move CI variables page to project settingsmove-variables-page	Dmitriy Zaporozhets	2015-09-28	10	-57/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Merge branch 'krb_auth_helper_ce' into 'master'	Douwe Maan	2015-09-29	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \|	Remove 'kerberos' from auth_helper.rb for gitlab-CE.	Ben Rosser	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Merge branch 'linktoee' into 'master'	Sytse Sijbrandij	2015-09-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	note about EE git hooks Because of https://gitlab.com/gitlab-com/www-gitlab-com/issues/415#note_2131220 See merge request !1934
\| * \| \| \| \| \| \|	changed words	karen Carias	2015-09-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	note about EE git hooks	karen Carias	2015-09-19	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update CHANGELOG for 8.0.3	Robert Speicher	2015-09-28	1	-3/+4
\| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'move-runners-page'	Dmitriy Zaporozhets	2015-09-28	19	-125/+123
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add missing spec filemove-runners-page	Dmitriy Zaporozhets	2015-09-28	1	-0/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Finish move of runners page to project settings	Dmitriy Zaporozhets	2015-09-28	4	-98/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Move runners page to project settings	Dmitriy Zaporozhets	2015-09-25	14	-105/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix admin runner page -> assign all button	Dmitriy Zaporozhets	2015-09-25	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'cyrillic-font' into 'master'	Dmitriy Zaporozhets	2015-09-28	4	-0/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Update Source Sans Pro font: adds support for cyrillic characterscyrillic-font	Dmitriy Zaporozhets	2015-09-28	4	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Douwe Maan	2015-09-28	22	-119/+444
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'projects'	Dmitriy Zaporozhets	2015-09-28	22	-119/+444
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| / / / \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	!important removed from pre	Andrey	2015-09-28	3	-10/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	edit action allign	Andrey	2015-09-28	2	-6/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Project page Update	Andrey	2015-09-25	12	-195/+263
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactoring buttons, fixes for projects filter on the dashboard and group page
\| \| * \| \| \| \| \|	Fix tests	Dmitriy Zaporozhets	2015-09-25	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	UI changes to the project view, empty project and project list new project ↵	Andrey	2015-09-24	9	-69/+373
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	button
* \| \| \| \| \| \| \|	Merge branch 'fxposter/gitlab-ce-login-from-admin'	Douwe Maan	2015-09-28	6	-0/+46
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add entry to changelog	Pavel Forkert	2015-09-24	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Clarify spec title explanation	Pavel Forkert	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove stuff from previous UI	Pavel Forkert	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move login button to user page, switched to POST method	Pavel Forkert	2015-09-24	5	-21/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add option to admin area to sign in as a specific user	Pavel Forkert	2015-09-24	5	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2291
* \| \| \| \| \| \| \|	Merge branch 'add-activity-dashboard-preference' into 'master'	Dmitriy Zaporozhets	2015-09-28	6	-5/+38
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Add user preference to view project activity and starred project activity as ↵	Stan Hu	2015-09-26	6	-5/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default dashboard Closes #2662
* \| \| \| \| \| \| \| \|	Merge pull request #9669 from aaronsnyder/admin-labels-grammar	Stan Hu	2015-09-26	3	-3/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar in admin area labels when no labels exist
\| * \| \| \| \| \| \| \| \|	Fix grammar in admin area labels .nothing-here-block when no labels exist.	Aaron Snyder	2015-09-26	3	-3/+4
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
* \| \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Stan Hu	2015-09-26	1	-3/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed grammar on Using Docker Build doc. See merge request !1448
\| * \| \| \| \| \| \| \|	Simplified sentence as per @stanhu's note	Cyriac Thomas	2015-09-26	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed grammar on Using Docker Build doc.	Cyriac Thomas	2015-09-26	1	-3/+2
\|/ / / / / / / /