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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added CHANGELOG itemsaml-external-groups	Patricio Cano	2016-04-06	2	-1/+1
\|
*	Added documentation	Patricio Cano	2016-04-06	2	-0/+73
\|
*	Fix error that was causing only one group to be returned and corrected specs ↵	Patricio Cano	2016-04-06	2	-2/+9
\| \| \| \|	to use the proper attribute type
*	Removed extra LDAP tests and added tests for the external groups feature	Patricio Cano	2016-04-05	1	-22/+46
\|
*	Changed config syntax and improved how chaanges in group memberships are ↵	Patricio Cano	2016-04-05	2	-29/+14
\| \| \| \|	handled when external groups is set up
*	Avoid saving again if the user attributes haven't changed	Patricio Cano	2016-04-04	1	-1/+1
\|
*	Config examples	Patricio Cano	2016-04-04	1	-0/+2
\|
*	Remove unnecessary LDAP tests from SAML tests	Patricio Cano	2016-04-04	1	-59/+7
\|
*	Prepare SAML for group retrieval	Patricio Cano	2016-04-04	3	-2/+80
\|
*	Merge branch 'remove-2fa-status' into 'master'	Jacob Schatz	2016-04-04	1	-2/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove 2FA status on enable page The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled. ### Before ![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png) ### After ![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png) See merge request !3436
\| *	Remove 2FA status on enable pageremove-2fa-status	Robert Schilling	2016-03-29	1	-2/+0
\| \|
* \|	Merge branch 'admin-pages-layout' into 'master'	Dmitriy Zaporozhets	2016-04-04	3	-35/+49
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve UI for admin/groups page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3523
\| * \|	Single quotes paradiseadmin-pages-layout	Dmitriy Zaporozhets	2016-04-04	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Improve UI for admin/groups page	Dmitriy Zaporozhets	2016-04-04	3	-35/+49
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Yorick Peterse	2016-04-04	5	-9/+11
\|\ \ \
\| * \ \	Merge branch 'dz-admin-area-fixes' into 'master'	Jacob Schatz	2016-04-04	5	-9/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set of UI fixes for admin area See merge request !3525
\| \| * \| \|	Fix missing paddings in admin area	Dmitriy Zaporozhets	2016-04-04	4	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Dont use monospace font for names	Dmitriy Zaporozhets	2016-04-04	1	-1/+1
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'hide_profile_activity_on_mobile' into 'master'	Jacob Schatz	2016-04-04	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide user profile activity graph on mobile closes #14507 ## Before ![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png) ## After ![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png) ## Medium width screen ![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif) See merge request !3412
* \| \ \ \	Merge branch 'fix-forked-project-link-specs' into 'master'	Yorick Peterse	2016-04-04	1	-0/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reload forked_project_link projects See merge request !3526
\| * \| \| \|	Reload forked_project_link projects	Yorick Peterse	2016-04-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes ./spec/services/projects/unlink_fork_service_spec.rb which somehow started failing on the master branch. It certainly isn't a very elegant solution but seems to be the easiest/best way of solving this problem for the time being.
* \| \| \| \|	Merge branch 'hide_profile_activity_on_mobile' into 'master'	Jacob Schatz	2016-04-04	2	-1/+7
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide user profile activity graph on mobile closes #14507 ## Before ![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png) ## After ![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png) ## Medium width screen ![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif) See merge request !3412
\| * \| \| \|	hide user profile activity graph on mobile and enable horizontal scroll for ↵hide_profile_activity_on_mobile	Arinde Eniola	2016-04-01	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	medium screens
* \| \| \| \|	Merge branch 'fix-award-emoji-menu' into 'master'	Jacob Schatz	2016-04-04	2	-2/+4
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix award emoji picker for relative_url MR !2888 caused a regression where the emoji picker does not load when using relative_url, because the path for the controller was hardcoded. See merge request !3493
\| * \| \| \|	Fix award emoji picker for relative_url	Sandra Freihofer	2016-04-01	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR !2888 caused a regression where the emoji picker does not load when using relative_url, because the path for the controller was hardcoded.
* \| \| \| \|	Merge branch '14083-build-labels' into 'master'	Jacob Schatz	2016-04-04	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add labels to block element Fixes #14083 Before:![Screen_Shot_2016-04-04_at_11.22.27_AM](/uploads/c35afd95ebca1b72f2aa37c72dc3c1a9/Screen_Shot_2016-04-04_at_11.22.27_AM.png) After: ![Screen_Shot_2016-04-04_at_11.21.34_AM](/uploads/94f180858cf8fe2fc7eeec541ce66d44/Screen_Shot_2016-04-04_at_11.21.34_AM.png) See merge request !3492
\| * \| \| \| \|	Add labels to block element14083-build-labels	Annabel Dunstone	2016-04-01	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'fix-ui-event' into 'master'	Dmitriy Zaporozhets	2016-04-04	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix event rendering when create project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 See merge request !3522
\| * \| \| \| \|	Fix event rendering when create projectfix-ui-event	Dmitriy Zaporozhets	2016-04-04	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'fix_remove_fork_link' into 'master'	Douwe Maan	2016-04-04	6	-11/+54
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove fork link closes all merge requests opened on source project Currently, if you: - create a fork - open a merge request on the source project - remove the fork link The created MR cannot be closed. With this MR, all pending MR is closed when the fork link is removed. See merge request !3189
\| * \| \| \| \|	Fix incorrect variable name	Baldinof	2016-04-04	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix rubocop in unlink fork service specs	Baldinof	2016-04-03	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Move unlink fork logic to a service	Baldinof	2016-03-22	5	-40/+52
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into fix_remove_fork_link	Baldinof	2016-03-14	158	-1030/+2902
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Close merge requests when removing fork relation	Baldinof	2016-03-11	5	-2/+33
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-sidebar-exapnd' into 'master'	Dmitriy Zaporozhets	2016-04-04	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transparent bg for expand sidebar button Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #14838 cc @jschatz1 See merge request !3520
\| * \| \| \| \| \|	Fix transparent bg for expand sidebar button	Dmitriy Zaporozhets	2016-04-04	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'update_repository_from_ee' into 'master'	Douwe Maan	2016-04-04	3	-10/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#local_branches from gitlab-ee. REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249 This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee See merge request !3496
\| * \| \| \| \| \|	Migrate Repository#local_branches from gitlab-ee.update_repository_from_ee	Rubén Dávila	2016-04-01	3	-10/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee
* \| \| \| \| \| \|	Merge branch 'space-before-brace-scss-lint' into 'master'	Jacob Schatz	2016-04-04	14	-20/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable SpaceBeforeBrace rule for SCSS Lint Also resolve all instances of spaces not being included before opening braces. See merge request !3463
\| * \| \| \| \| \| \|	Enable SpaceBeforeBrace rule for SCSS Lint	connorshea	2016-03-30	14	-20/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also resolve all instances of spaces not being included before opening braces.
* \| \| \| \| \| \| \|	Add 8.6.4 changelog item	Rémy Coutable	2016-04-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'fix-mr-for-orphaned-branches' into 'master'	Rémy Coutable	2016-04-04	4	-2/+35
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix creation of merge requests for orphaned branches with images When attempting to create a merge request from an orphaned branch (e.g. this happens for the first commit of any repo) that contained images, GitLab would fail with a Error 500. This MR fixes that problem. Closes #14875 See merge request !3511
\| * \| \| \| \| \| \| \|	Fix creation of merge requests for orphaned branches	Stan Hu	2016-04-04	4	-2/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14875
* \| \| \| \| \| \| \| \|	Merge branch '8.7-rc1' into 'master'	Yorick Peterse	2016-04-04	2	-2/+148
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added 8.7 install/update guides See merge request !3517
\| * \| \| \| \| \| \| \| \|	Added 8.7 install/update guides	Yorick Peterse	2016-04-04	2	-2/+148
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'banzai-webscale' into 'master'	Douwe Maan	2016-04-04	7	-146/+215
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve rendering performance of Banzai Related issues: * gitlab-org/gitlab-ce#14315 * gitlab-org/gitlab-ce#13651 TODO: * [x] `Banzai::Filter::ExternalIssueReferenceFilter#call` calls `Project#default_issues_tracker?` which runs a query on every call. Memoizing this only works if the `Project` instance is shared between instances of this filter. Either way it should at most only run this method once. * [x] Fix the two failing specs * [x] Clean of the various `call` methods in the filters where I inlined methods * [x] Remove the `replace_XXX` methods in ReferenceFilter now that they're no longer used. See merge request !3389
\| * \| \| \| \| \| \| \| \|	Cleaned up caching in AbstractReferenceFilter	Yorick Peterse	2016-04-04	1	-15/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleaning this up any further is a bit tricky as the caches in question should only be evaluated if RequestStore is actually enabled.
\| * \| \| \| \| \| \| \| \|	Added CHANGELOG entry for Markdown performance	Yorick Peterse	2016-04-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Cache default_issues_tracker? in Banzai	Yorick Peterse	2016-04-04	1	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Every object processed by ExternalIssueReferenceFilter can return a different Project instance when calling "project". For example, every note processed will have it's own associated Project. If we were to cache Project#default_issues_tracker? on Project level this would have no impact on Markdown rendering timings as the cache would have to be built for every Project instance without it ever being re-used. To work around this we cache Project#default_issues_tracker? in Banzai::Filter::ExternalIssueReferenceFilter using the project's _id_ instead of the whole object. This setup allows re-using of the cached data even when the Project instances used are different, as long as the actual project IDs are the same.