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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Updated based on Ruby feedback	Phil Hughes	2016-04-12	1	-12/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Tests update	Phil Hughes	2016-04-12	2	-22/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updated tests	Phil Hughes	2016-04-12	1	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master'	Jacob Schatz	2016-04-12	1	-0/+21
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix quick submit missing in edit merge request page closes #14953 ![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif) See merge request !3601
\| * \| \| \| \| \| \|	add some changes to the testfix_quick_submit_missing_in_edit_merge_request	Arinde Eniola	2016-04-07	1	-11/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add test	Arinde Eniola	2016-04-07	1	-0/+27
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'decouple-member-notification' into 'master'	Douwe Maan	2016-04-12	5	-44/+109
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421
\| * \| \| \| \| \| \|	Fix specs for Projects::NotificationSettingsController	Douglas Barbosa Alexandre	2016-04-12	1	-28/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve specs for group/project notification controllerdecouple-member-notification	Douglas Barbosa Alexandre	2016-04-12	2	-3/+53
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Requires user to be signed in when changing notification settings	Douglas Barbosa Alexandre	2016-04-11	2	-0/+48
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Reuse `User#notification_settings_for` when it's possible	Douglas Barbosa Alexandre	2016-04-11	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-11	8	-22/+204
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-08	62	-262/+1581
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add spec for user_id uniq in NotificationSetting model	Dmitriy Zaporozhets	2016-03-30	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Refactor notification helper and fix notification service	Dmitriy Zaporozhets	2016-03-30	1	-28/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Small refactoring and cleanup of notification logic	Dmitriy Zaporozhets	2016-03-30	2	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Update NotificationService to use NotificationSettings instead of membership	Dmitriy Zaporozhets	2016-03-30	1	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Introduce NotificationSetting model	Dmitriy Zaporozhets	2016-03-30	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It will hold notification setting per group or per project. It will allow get rid of notification level stored in Member model Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'api-delete-note' into 'master'	Rémy Coutable	2016-04-12	2	-0/+76
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete notes via API Supports deleting issues, snippets, and merge requests via the API. * Closes #14944 * Closes #14845 * Closes #6060 @zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet. @rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. See merge request !3557
\| * \| \| \| \| \| \| \| \|	Adapt tests to new testing guidelines	Robert Schilling	2016-04-12	2	-11/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix code review issues	Robert Schilling	2016-04-12	2	-5/+24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Delete notes via API	Robert Schilling	2016-04-12	2	-0/+58
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'api-get-tag' into 'master'	Rémy Coutable	2016-04-12	1	-0/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to retrieve a single tag * Closes #14330 /cc @dblessing See merge request !3577
\| * \| \| \| \| \| \| \| \|	Fix minor styling issues from code review	Robert Schilling	2016-04-12	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	API: Ability to retrieve a single tag	Robert Schilling	2016-04-12	1	-0/+17
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687	Zeger-Jan van de Weg	2016-04-12	1	-3/+17
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	API: Add iid filter to milestones	Robert Schilling	2016-04-12	1	-3/+5
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'issue_1752' into 'master'	Robert Speicher	2016-04-11	1	-4/+19
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone removal problem when editing issues fixes #1752 See merge request !3571
\| * \| \| \| \| \| \|	improve specs code syntaxissue_1752	Felipe Artur	2016-04-07	1	-11/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix milestone removal problem when editing issues	Felipe Artur	2016-04-06	1	-0/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dashboard-filter-milestone' into 'master'	Jacob Schatz	2016-04-11	1	-0/+54
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with dashboard/issues not filtering by milestone Closes #15128 See merge request !3650
\| * \| \| \| \| \| \|	Fixed issue with dashboard/issues not filtering by milestonedashboard-filter-milestone	Phil Hughes	2016-04-11	1	-0/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15128
* \| \| \| \| \| \| \|	Merge branch 'metrics-measure-block-transaction' into 'master'	Yorick Peterse	2016-04-11	2	-11/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store block timings as transaction values See merge request !3649
\| * \| \| \| \| \| \| \|	Fixed stubbing for Gitlab::Metrics specs	Yorick Peterse	2016-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the measure method uses Transaction.current directly the SQL subscriber (Subscribers::ActiveRecord) will add timings of queries triggered by DB cleaner.
\| * \| \| \| \| \| \| \|	Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transaction	Yorick Peterse	2016-04-11	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added specs for Gitlab::Metrics::System.cpu_time	Yorick Peterse	2016-04-11	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Store block timings as transaction values	Yorick Peterse	2016-04-11	1	-11/+5
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to query, simplifies the code, and makes it possible to figure out what transaction the data belongs to (simply because it's now stored _in_ the transaction). This new setup keeps track of both the real/wall time _and_ CPU time spent in a block, both measured using milliseconds (to keep all units the same).
* \| \| \| \| \| \| \|	Merge branch 'rs-form_errors' into 'master'	Dmitriy Zaporozhets	2016-04-11	1	-0/+46
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
\| * \| \| \| \| \| \| \|	Standardize the way we check for and display form errorsrs-form_errors	Robert Speicher	2016-04-04	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard.
* \| \| \| \| \| \| \| \|	Merge branch 'mr-ui-update' into 'master'	Jacob Schatz	2016-04-11	1	-3/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
\| * \| \| \| \| \| \| \|	Build fix	Phil Hughes	2016-04-06	1	-3/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-remove-markdown-tips' into 'master'	Dmitriy Zaporozhets	2016-04-11	1	-7/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `random_markdown_tip` helper Only usage got removed in !3442 See merge request !3637
\| * \| \| \| \| \| \| \|	Remove `random_markdown_tip` helperrs-remove-markdown-tips	Robert Speicher	2016-04-09	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only usage got removed in !3442
* \| \| \| \| \| \| \| \|	write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emoji	Arinde Eniola	2016-04-09	1	-0/+64
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '14400-diff-redesign' into 'master'	Jacob Schatz	2016-04-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Diff redesign Fixes #14400 Fixes #13500 ![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif) See merge request !3476
\| * \| \| \| \| \| \| \|	Diff design updates	Annabel Dunstone	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update diff colors and icons	Annabel Dunstone	2016-04-07	1	-1/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Instrument Rails cache codeinstrument-rails-cache	Yorick Peterse	2016-04-08	1	-0/+71
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to track how much time of a transaction is spent in dealing with cached data.
* \| \| \| \| \| \|	Merge branch 'issue_14012' into 'master'	Rémy Coutable	2016-04-07	1	-0/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix problem when creating milestones in groups without projects Fixes #14012 See merge request !3481
\| * \| \| \| \| \|	Implement review suggestions	Felipe Artur	2016-04-07	1	-1/+1
\| \| \| \| \| \| \|