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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use the configured Kaminari "per page" defaultrs-use-kaminari-default	Robert Speicher	2016-03-19	28	-37/+34
\|
*	Merge branch 'remove-wip' into 'master'	Jacob Schatz	2016-03-19	1	-2/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Easily (un)mark merge request as WIP using link Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516 ## Link to add `WIP` prefix (underline is visible because of hover) ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png) ## Link to remove `WIP` prefix ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png) ## System note after WIP is added ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png) ## Widget with link to remove WIP ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png) ## Flash after WIP is removed ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png) ## System note after WIP is removed ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png) ## Widget when current user cannot remove the WIP prefix ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png) cc @creamzy See merge request !3006
\| *	Merge remote-tracking branch 'origin/master' into remove-wip	Rémy Coutable	2016-03-18	41	-180/+430
\| \|\
\| * \|	Easily (un)mark merge request as WIP using link	Douwe Maan	2016-02-26	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3768
* \| \|	Merge branch 'fix/gitlab-omniauth-issue' into 'master'	Douwe Maan	2016-03-19	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	attempting to fix omniauth problem Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361 See merge request !2876
\| * \|	another attempt to fix oauth issue	James Lopez	2016-02-19	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-19	4	-7/+15
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix/gitlab-omniauth-issue
\| * \| \|	attempting to fix omniauth problem	James Lopez	2016-02-18	1	-0/+1
\| \| \| \|
* \| \| \|	Dedupe labels in labels selector in Dashboard pagesfix/14418	Rémy Coutable	2016-03-18	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also moved useless helper methods and directly to the DashboardController.
* \| \| \|	Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master'	Douwe Maan	2016-03-18	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
\| * \| \| \|	Use todo.done without ! in the controller to mark todo as done	Douglas Barbosa Alexandre	2016-03-18	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Fixed failing tests	Phil Hughes	2016-03-18	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Updated controller with before_action	Phil Hughes	2016-03-18	2	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed other issues based on feedback
* \| \| \| \|	Fixes issue on dashboard issues	Phil Hughes	2016-03-18	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They would try to load JSON from a project even though it isn't a single project
* \| \| \| \|	Full labels data in JSON	Phil Hughes	2016-03-18	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Fixed issue with labels dropdown getting wrong labels	Phil Hughes	2016-03-18	2	-0/+15
\|/ / / /
* \| \| \|	Merge branch 'confidential-issues' into 'master'	Douwe Maan	2016-03-18	2	-3/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confidential issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227 See merge request !3282
\| * \| \| \|	Restrict access for confidential issues on autocomplete	Douglas Barbosa Alexandre	2016-03-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Restrict access to confidential issues	Douglas Barbosa Alexandre	2016-03-17	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Add an option to user make an issue confidential	Douglas Barbosa Alexandre	2016-03-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'optimistic-todos' into 'master'	Jacob Schatz	2016-03-18	1	-2/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds small AJAX optimistic functionality to todos. Fixes #13656 <br/> A good first step and boring solution. <br/> Will make ajax call to remove each issue. <br/> If issue is last in group of issues will refresh page. <br/> If issues remain in group will remove row with JS. <br/> Adds loading spinner to button and disables. <br/> ![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/> cc @dzaporozhets @JobV @dbalexandre See merge request !2946
\| * \| \| \|	Mark all as done through AJAX	Phil Hughes	2016-03-17	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Removed the flash success message	Phil Hughes	2016-03-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the group if empty
\| * \| \| \|	Adds small AJAX optimistic functionality to todos.	Jacob Schatz	2016-03-17	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13656 A good first step and boring solution.
* \| \| \| \|	Merge branch '4009-external-users' into 'master'	Douwe Maan	2016-03-17	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
\| * \ \ \ \	Merge branch 'master' into 4009-external-users4009-external-users	Zeger-Jan van de Weg	2016-03-15	7	-40/+54
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into 4009-external-users	Zeger-Jan van de Weg	2016-03-14	6	-22/+44
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	External Users	Zeger-Jan van de Weg	2016-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
* \| \| \| \| \| \| \|	Merge branch 'new-branch-button-issue' into 'master'	Douwe Maan	2016-03-17	2	-3/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New branch button on issues Creates a button which creates a branch for you, referencing the original issue in the branch name. When creating the MR the text `Closes #iid` is appended to the description field. The button; with styling ![Screenshot_from_2016-02-13_17-28-54](/uploads/9595fbfef88c10a499829beaa3db11c1/Screenshot_from_2016-02-13_17-28-54.png) Links to the related branches on the issue ![Screenshot_from_2016-02-13_17-31-48](/uploads/ee7a78754eb5e2389f8671771bb59af9/Screenshot_from_2016-02-13_17-31-48.png) Styled like the MR links ![Screenshot_from_2016-02-13_17-31-53](/uploads/c60130333a650a16f51b014aeb1458c3/Screenshot_from_2016-02-13_17-31-53.png) Please provide input on the following; the CI repo on the GDK had the following happening with the current way I implemented the matching: ![Screenshot_from_2016-02-14_08-57-19](/uploads/35e7a3687a0fa801aba1ad66305ab2ff/Screenshot_from_2016-02-14_08-57-19.png) Closes #3886 cc @DouweM See merge request !2808
\| * \ \ \ \ \ \ \	Merge branch 'master' into new-branch-button-issue	Zeger-Jan van de Weg	2016-03-17	2	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Incorporate review	Zeger-Jan van de Weg	2016-03-15	1	-4/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Enhance new branch button on an issue	Zeger-Jan van de Weg	2016-03-15	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	new-branch-button	Zeger-Jan van de Weg	2016-03-15	2	-3/+14
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Reuse `no_cache_headers` method in badges controller	Grzegorz Bizon	2016-03-17	1	-12/+1
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Clearify who deletes the user	Zeger-Jan van de Weg	2016-03-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix broken specs	Zeger-Jan van de Weg	2016-03-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add ability to delete a user with force	Zeger-Jan van de Weg	2016-03-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	A worker deletes a user, so the request doesn't time out	Zeger-Jan van de Weg	2016-03-15	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13261
* \| \| \| \| \|	Create a SentNotification record for #relabeled_issue_email / ↵	Rémy Coutable	2016-03-15	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#relabeled_merge_request_email
* \| \| \| \| \|	Move the #toggle_subscription controller method to a concern	Rémy Coutable	2016-03-15	3	-28/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Improving the original label-subscribing implementation	Rémy Coutable	2016-03-15	3	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
* \| \| \| \| \|	Original implementation to allow users to subscribe to labels	Timothy Andrew	2016-03-15	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
* \| \| \| \| \|	Merge branch 'revert-avatar-cropping' into 'master'	Rémy Coutable	2016-03-15	1	-3/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert the avatar cropping feature Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping See merge request !3223
\| * \| \| \| \| \|	Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-cropping	Rémy Coutable	2016-03-15	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
* \| \| \| \| \| \|	Merge branch 'application-settings' into 'master'	Robert Speicher	2016-03-15	2	-17/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Applications tab on profile settings Closes #13855 See merge request !3031
\| * \| \| \| \| \|	Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settings	Robert Speicher	2016-03-13	2	-22/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we were doing all of kinds of code gymnastics and flash abuse in order to work with a Doorkeeper controller but have it _appear_ at the `/profile/applications` path. Fortunately we can just tell Rails to use a different controller to handle that route, and we get the best of both worlds.
\| * \| \| \| \| \|	Fixed Ruby style error	Phil Hughes	2016-03-04	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Applications tab on profile settings	Phil Hughes	2016-03-04	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13855
* \| \| \| \| \| \|	Merge branch 'auto-gc' into 'master' revert-01160fc0	Douwe Maan	2016-03-15	1	-4/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run 'git gc' every 10 pushes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14250 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12620 Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254 Associated gitlab-shell MR: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44 See merge request !3206
\| * \| \| \| \| \|	Use an exception to pass messages	Jacob Vosmaer	2016-03-15	1	-5/+10
\| \| \| \| \| \| \|