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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix specs and remove unnecessary console.log	Stan Hu	2016-03-20	1	-2/+2
\|
*	Merge branch 'fix-mr-close-button' into 'master'	Jacob Schatz	2016-03-18	1	-0/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with close button not working on MR Closes #14383 See merge request !3295
\| *	Added test	Phil Hughes	2016-03-18	1	-0/+8
\| \|
* \|	Merge branch 'confidential-issues' into 'master'	Douwe Maan	2016-03-18	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 to confidential issues on activity feed	Douglas Barbosa Alexandre	2016-03-17	1	-1/+1
\| \| \|
* \| \|	Merge branch 'optimistic-todos' into 'master'	Jacob Schatz	2016-03-18	1	-1/+0
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Fixed failing testsoptimistic-todos	Phil Hughes	2016-03-17	1	-1/+0
\| \| \|
* \| \|	Improve award emoji test reliability by checking that the emoji is displayed	Stan Hu	2016-03-17	2	-4/+11
\| \|/ \|/\| \| \| \| \|	before the search field is focused
* \|	Reuse `no_cache_headers` method in badges controller	Grzegorz Bizon	2016-03-17	1	-1/+1
\|/
*	Fix wiki search results point to raw source	Hiroyuki Sato	2016-03-17	1	-1/+1
\|
*	Merge branch 'fix-capybara-deprecation-warnings' into 'master'	Robert Speicher	2016-03-16	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix Capybara 2.6.2 deprecation warnings See merge request !3236
\| *	Fix Capybara 2.6.2 deprecation warnings	Stan Hu	2016-03-15	1	-1/+1
\| \|
* \|	Improving the original label-subscribing implementation	Rémy Coutable	2016-03-15	2	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+50
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-14/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	-14/+6
\| \| \| \| \| \| \| \| \| \|	This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
* \|	Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master'	Douwe Maan	2016-03-15	3	-1/+32
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes "iid of max iid" in Issuable sidebar for merged MR Fixes #13928. See merge request !3046
\| * \|	Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iid	Rémy Coutable	2016-03-08	3	-1/+32
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13928
* \| \|	Merge branch 'application-settings' into 'master'	Robert Speicher	2016-03-15	2	-9/+4
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Applications tab on profile settings Closes #13855 See merge request !3031
\| * \|	Fixed failing application settings tests	Phil Hughes	2016-03-04	2	-9/+4
\| \| \|
* \| \|	Merge branch 'fix-commit-status-rendering' into 'master'	Robert Speicher	2016-03-15	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup Ci::Commit, Ci::Build and CommitStatus views This MR tries to do first sweep of cleanups to Ci::Commit and Ci::Build objects removing all view-related functions and fixing the API from other side. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046 See merge request !2760
\| * \| \|	Cleanup CiCommit and CiBuild	Kamil Trzcinski	2016-03-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove all view related methods from Ci::Build and CommitStatus - Remove unused Ci::Commit and Ci::Build methods - Use polymorphism to render different types of CommitStatus
* \| \| \|	Merge branch 'improve-award-emoji-spec' into 'master'	Douwe Maan	2016-03-14	1	-4/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve award emoji test reliability and eliminate sleeps Closes #14129 See merge request !3195
\| * \| \| \|	Improve award emoji test reliability and eliminate sleepsimprove-award-emoji-spec	Stan Hu	2016-03-13	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14129
* \| \| \| \|	Merge branch 'share-project-ce' into 'master'	Dmitriy Zaporozhets	2016-03-14	6	-0/+114
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
\| * \| \| \| \|	Bring shared project feature tests from EE	Dmitriy Zaporozhets	2016-03-12	4	-0/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Add finders logic and tests for shared projects feature	Dmitriy Zaporozhets	2016-03-11	2	-0/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'issue-filter-tests' into 'master'	Robert Speicher	2016-03-14	2	-18/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed tests for MR & issue filters See merge request !3203
\| * \| \| \| \| \|	Fixed tests for MR & issue filtersissue-filter-tests	Phil Hughes	2016-03-14	2	-18/+10
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-sleeps-from-network-graph-spec' into 'master'	Robert Speicher	2016-03-14	2	-5/+7
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove sleeps from network graph feature spec Also removed a double negative in the step description See merge request !3199
\| * \| \| \| \|	Remove sleeps from network graph feature spec	Stan Hu	2016-03-13	2	-5/+7
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Use Capybara find methods and remove sleeps in feature specs in "All Issues" ↵improve-issues-filter-all-spec	Stan Hu	2016-03-13	1	-8/+5
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	filter
* \| \| \|	Merge branch 'group-activity-separate-tab' into 'master'	Robert Speicher	2016-03-11	2	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move group activity feed to separate page for consistency with dashboard and project pages Fixes #14161. Part of #13480 See merge request !3157
\| * \| \| \|	Move group activity feed to separate page for consistency with dashboard and ↵	Dmitriy Zaporozhets	2016-03-10	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	project pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'award-emoji-design-update' into 'master'	Jacob Schatz	2016-03-11	1	-13/+13
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated UI of award emoji Closes #13878 See merge request !3028
\| * \| \| \|	Updated award emoji tests	Phil Hughes	2016-03-11	1	-13/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'account-settings' into 'master'	Jacob Schatz	2016-03-11	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Account settings Closes #13854 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4802a7b4f74f17d25a611ed1a2200445/account-settings.png) See merge request !3039
\| * \| \| \| \|	Fixed failing tests	Phil Hughes	2016-03-11	1	-2/+2
\| \|/ / / /
* \| \| \| \|	Merge branch 'comment-discard-button' into 'master'	Jacob Schatz	2016-03-11	7	-12/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added discard button to comment form Also changed the labels on the buttons to better match the action they are completing. Closes #8057 See merge request !3085
\| * \| \| \| \|	Updated tests	Phil Hughes	2016-03-04	6	-10/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed failing comment test	Phil Hughes	2016-03-04	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed tests for comment forms	Phil Hughes	2016-03-04	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'comment-error' into 'master'	Dmitriy Zaporozhets	2016-03-11	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add error for ajax:error when submitting comments Fixes #13814 ![Screen_Shot_2016-02-25_at_1.54.56_PM](/uploads/d70d706d306079df1b00d70f09affb63/Screen_Shot_2016-02-25_at_1.54.56_PM.png) cc @dblessing See merge request !2976
\| * \| \| \|	Change test in an attempt to pass.comment-error	Jacob Schatz	2016-03-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks @rspeicher!
* \| \| \| \|	web hooks to webhooks	ashleys	2016-03-10	2	-4/+4
\|/ / / /
* \| \| \|	Fixed failing tests	Phil Hughes	2016-03-10	4	-14/+36
\| \|/ / \|/\| \|
* \| \|	Retry spinach tests	Kamil Trzcinski	2016-03-09	2	-0/+15
\| \| \|
* \| \|	Merge branch 'improve-archived-projects'	Dmitriy Zaporozhets	2016-03-09	3	-1/+10
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix test	Dmitriy Zaporozhets	2016-03-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add test for archive toggle feature	Dmitriy Zaporozhets	2016-03-04	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>