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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove max-width from commentsnotes-input	Annabel Dunstone	2016-04-12	2	-14/+0
\|
*	Input updates	Annabel Dunstone	2016-04-12	3	-5/+49
\|
*	Wrap text in notes box if longer than code in diff	Annabel Dunstone	2016-04-12	1	-0/+1
\|
*	Merge branch 'rs-update-spring' into 'master'	Robert Speicher	2016-04-12	2	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update spring and spring-commands-spinach Spring changelog: https://git.io/vVAUY See merge request !3681
\| *	Update spring and spring-commands-spinachrs-update-spring	Robert Speicher	2016-04-12	2	-6/+6
\| \| \| \| \| \| \| \|	Spring changelog: https://git.io/vVAUY
* \|	Merge branch 'issue_14206' into 'master'	Jacob Schatz	2016-04-12	6	-7/+160
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix datetimes on tooltips Closes #14206 Updates tooltip datetimes on `.timeago()` instances. Inline notes ![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png) Existing and new notes ![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png) Issuable dates ![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png) Build dates ![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png) See merge request !3497
\| * \	Merge branch 'master' into issue_14206issue_14206	Alfredo Sumaran	2016-04-11	214	-943/+2578
\| \|\ \
\| * \| \|	Rename method and initialize .timeago inside	Alfredo Sumaran	2016-04-11	4	-19/+10
\| \| \| \|
\| * \| \|	Update datetime in .timeago elements	Alfredo Sumaran	2016-04-07	3	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should be done before .timeago() is called on the element
\| * \| \|	Add datetime_utility.js.coffee	Alfredo Sumaran	2016-04-07	1	-0/+15
\| \| \| \|
\| * \| \|	Add date.format.js	Alfredo Sumaran	2016-04-07	1	-0/+125
\| \| \| \|
\| * \| \|	Convert time param to Time	Alfredo Sumaran	2016-04-07	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'check-import-job-status' into 'master'	Robert Speicher	2016-04-12	1	-2/+8
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check and report import job status to help diagnose issues with forking There are no functional changes, but adding checks/logs for Sidekiq job IDs to help track down why many users seem to get stuck fork/import jobs. See merge request !3672
\| * \| \|	Check and report import job status to help diagnose issues with forking	Stan Hu	2016-04-11	1	-2/+8
\| \| \| \|
* \| \| \|	Merge branch 'project-title-dropdown' into 'master'	Jacob Schatz	2016-04-12	10	-37/+82
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project dropdown in header uses new dropdown See merge request !3339
\| * \| \| \|	Updated CHANGELOG	Phil Hughes	2016-04-12	1	-9/+1
\| \| \| \| \|
\| * \| \| \|	Updated based on Ruby feedback	Phil Hughes	2016-04-12	2	-1/+9
\| \| \| \| \|
\| * \| \| \|	Updated Ruby	Phil Hughes	2016-04-12	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added CHANGELOG item
\| * \| \| \|	Updated based on Ruby feedback	Phil Hughes	2016-04-12	3	-19/+21
\| \| \| \| \|
\| * \| \| \|	Tests update	Phil Hughes	2016-04-12	2	-22/+24
\| \| \| \| \|
\| * \| \| \|	Updated tests	Phil Hughes	2016-04-12	3	-4/+3
\| \| \| \| \|
\| * \| \| \|	Project dropdown in header uses new dropdown	Phil Hughes	2016-04-12	6	-13/+51
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master'	Robert Speicher	2016-04-12	2	-2/+2498
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix emoji aliases not showing in autocomplete closes #14948 See merge request !3595
\| * \| \| \| \|	fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocomplete	Arinde Eniola	2016-04-09	2	-2/+2498
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'member-access-note-row' into 'master'	Jacob Schatz	2016-04-12	1	-6/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with member access not being visible on notes This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement ![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png) Fixes #15049 See merge request !3618
\| * \| \| \| \| \|	Fixed issue with member access not being visible on notesmember-access-note-row	Phil Hughes	2016-04-08	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15049
* \| \| \| \| \| \|	Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master'	Jacob Schatz	2016-04-12	2	-1/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix quick submit missing in edit merge request page	Arinde Eniola	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'admin-pages-layout-sass-update' into 'master'	Jacob Schatz	2016-04-12	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated media query for admin/groups search box @jschatz1 based on your comment https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3523#note_4632743 See merge request !3599
\| * \| \| \| \| \| \| \|	Updated meqia query for admin/groups search boxadmin-pages-layout-sass-update	Phil Hughes	2016-04-07	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'right-sidebar-link-hover' into 'master'	Jacob Schatz	2016-04-12	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed colour of dropdown link hover ![Screen_Shot_2016-04-07_at_16.02.40](/uploads/bfbfa5d1b82576b6bafaefd567effa06/Screen_Shot_2016-04-07_at_16.02.40.png) See merge request !3596
\| * \| \| \| \| \| \| \|	Fixed colour of dropdown link hoverright-sidebar-link-hover	Phil Hughes	2016-04-07	1	-0/+6
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix_labels_not_showing_in_todos' into 'master'	Jacob Schatz	2016-04-12	3	-1/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix labels not displayed on todos page closes #14512,#13920 # For Todos ## Before ![Screen_Shot_2016-03-23_at_8.59.32_PM](/uploads/0c22c7674783031c9be842860082fdc2/Screen_Shot_2016-03-23_at_8.59.32_PM.png) ## After ![Screen_Shot_2016-03-24_at_12.35.06_PM](/uploads/f62d3f39c0aa2f7079368e157a3a558c/Screen_Shot_2016-03-24_at_12.35.06_PM.png) # For Activity Feed ## Before ![Screen_Shot_2016-03-24_at_12.37.41_PM](/uploads/744370db7a4bd3782c029d80c3694ee7/Screen_Shot_2016-03-24_at_12.37.41_PM.png) ## After ![Screen_Shot_2016-03-24_at_12.37.00_PM](/uploads/9939817c14e98b50b3e16c8b7b9cf009/Screen_Shot_2016-03-24_at_12.37.00_PM.png) See merge request !3371
\| * \| \| \| \| \| \| \|	fix labels not showing on todos pagefix_labels_not_showing_in_todos	Arinde Eniola	2016-04-06	3	-1/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'decouple-member-notification' into 'master'	Douwe Maan	2016-04-12	37	-338/+447
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify Projects::NotificationSettingsController	Douglas Barbosa Alexandre	2016-04-12	3	-9/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix partial for update project notifications	Douglas Barbosa Alexandre	2016-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Requires user to be signed in when changing notification settings	Douglas Barbosa Alexandre	2016-04-11	4	-0/+52
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Reuse `User#notification_settings_for` when it's possible	Douglas Barbosa Alexandre	2016-04-11	5	-10/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-11	119	-588/+1169
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Use Hash instead of Array on NotificationSetting#level enum	Douglas Barbosa Alexandre	2016-04-11	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix schema.rb	Douglas Barbosa Alexandre	2016-04-08	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix CHANGELOG	Douglas Barbosa Alexandre	2016-04-08	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update gitlab-shell to 2.7.2	Yorick Peterse	2016-04-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add method to return the user notification setting for a group, or a project	Douglas Barbosa Alexandre	2016-04-08	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use default_value_for to set default NotificationSetting#level	Douglas Barbosa Alexandre	2016-04-08	2	-9/+6
\| \| \| \| \| \| \| \| \| \| \|