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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Wrap code in parallel viewparallel-diff	Annabel Dunstone	2016-04-14	1	-0/+5
\|
*	Fixed issue with other links being clicked in diffs	Phil Hughes	2016-04-14	1	-2/+2
\|
*	Correctly scrolls to the line when clicking	Phil Hughes	2016-04-14	1	-2/+10
\|
*	Diff viewer links to correct part of the file	Phil Hughes	2016-04-14	6	-4/+54
\| \| \| \| \| \|	Added highlight colours to diff rows Closes #13852
*	Fixed scss syntax issue	Phil Hughes	2016-04-14	1	-1/+1
\|
*	Focus variable for dropzone	Phil Hughes	2016-04-14	2	-1/+2
\|
*	Added CHANGELOG item	Phil Hughes	2016-04-14	1	-2/+2
\|
*	Updated dropzone hover styling	Phil Hughes	2016-04-14	4	-22/+20
\|
*	Removed GL Actions class	Phil Hughes	2016-04-14	2	-54/+0
\|
*	Updated all GFM forms to use new GLForm class	Phil Hughes	2016-04-14	2	-21/+3
\|
*	Milestones use new GLForm class	Phil Hughes	2016-04-14	1	-1/+1
\|
*	merge request form uses new GLForm	Phil Hughes	2016-04-14	1	-1/+1
\|
*	Updated issue form to use new GLForm	Phil Hughes	2016-04-14	2	-4/+10
\|
*	Destroy discussion form	Phil Hughes	2016-04-14	2	-8/+22
\|
*	Notes form JS update	Phil Hughes	2016-04-14	3	-50/+91
\| \| \| \| \|	Updated the JS to have a standard class with standard actions for each form Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
*	Merge branch 'issue_15093' into 'master'	Jacob Schatz	2016-04-13	1	-1/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set tooltips for new added labels Fixes #15093 ![Screen_Shot_2016-04-11_at_5.50.21_PM](/uploads/52d06f6ccb3ca42e7ce75b94111514c2/Screen_Shot_2016-04-11_at_5.50.21_PM.png) See merge request !3667
\| *	Set tooltips for new added labelsissue_15093	Alfredo Sumaran	2016-04-11	1	-1/+3
\| \|
* \|	Merge branch 'issuable-form-alignment' into 'master'	Jacob Schatz	2016-04-13	1	-0/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment on issuable new form Fixes #13802 ![Screen_Shot_2016-04-11_at_17.03.29](/uploads/d359580e693284d4b694d8158d4f736e/Screen_Shot_2016-04-11_at_17.03.29.png) See merge request !3661
\| * \|	Fixed alignment on issuable new formissuable-form-alignment	Phil Hughes	2016-04-11	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13802
* \| \|	Merge branch 'async-related-mrs' into 'master'	Rémy Coutable	2016-04-13	1	-0/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
\| * \| \|	Load related MRs/branches asynchronously	Yorick Peterse	2016-04-13	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
* \| \| \|	Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master'	Jacob Schatz	2016-04-13	1	-7/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make milestone labels in labels tab similar to that of the labels page I realized that some of the changes for the labels page was not reflecting in the labels list in milestone page. ## Desktop ![Screen_Shot_2016-04-11_at_4.25.36_PM](/uploads/e21f3c5a9187fe32472e796171781b5d/Screen_Shot_2016-04-11_at_4.25.36_PM.png) ## Mobile ![Screen_Shot_2016-04-11_at_4.26.47_PM](/uploads/5c9f75ca0938fc30ab47c5520215f692/Screen_Shot_2016-04-11_at_4.26.47_PM.png) See merge request !3658
\| * \| \| \|	make milestone labels in labels tab similar to that of the labels pagemake_milestone_labels_tab_similar_to_labels_page	Arinde Eniola	2016-04-11	1	-7/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-bug-causing-comment-to-submit-twice' into 'master'	Jacob Schatz	2016-04-13	1	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing comment form in issue to submit twice when CTRL+Enter is pressed twice See merge request !3655
\| * \| \| \| \|	fix bug causing comment form in issue to submit twice when CTRL+Enter is ↵fix-bug-causing-comment-to-submit-twice	Arinde Eniola	2016-04-11	1	-1/+5
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pressed twice
* \| \| \| \|	Merge branch 'carousel-remove' into 'master'	Robert Speicher	2016-04-13	2	-2/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Bootstrap Carousel The Bootstrap carousel module is used for image carousels, and we don't use it anywhere on the site. Fixes #14670. See merge request !3624
\| * \| \| \| \|	Remove Bootstrap Carousel	connorshea	2016-04-12	2	-2/+11
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Bootstrap carousel module is used for image carousels, and we don't use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component. Fixes #14670.
* \| \| \| \|	Merge branch 'label-filter' into 'master'	Jacob Schatz	2016-04-13	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed not being able to filter by any or no labels Brings back the options to filter by any or no label Closes #15008 ![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png) See merge request !3589
\| * \| \| \|	Filtering by any label keeps the text on the toggle buttonlabel-filter	Phil Hughes	2016-04-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'notes-input' into 'master'	Jacob Schatz	2016-04-12	3	-5/+36
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap text in notes box if longer than code in diff * Fixes branch name overflow * Text and inline `code` wraps in comments * `code` blocks scroll horizontally ![Screen_Shot_2016-04-11_at_4.59.15_PM](/uploads/39eee7d35ea79d1a3944aa6281b72121/Screen_Shot_2016-04-11_at_4.59.15_PM.png) See merge request !3626
\| * \| \| \| \|	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
\| \| \| \| \| \|
* \| \| \| \| \|	Fix todo_target_path for todos where target was removedfix-todo-target-path	Douglas Barbosa Alexandre	2016-04-12	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'issue_14206' into 'master'	Jacob Schatz	2016-04-12	4	-6/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	29	-153/+455
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	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
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'project-title-dropdown' into 'master'	Jacob Schatz	2016-04-12	3	-1/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project dropdown in header uses new dropdown See merge request !3339
\| * \| \| \| \| \|	Project dropdown in header uses new dropdown	Phil Hughes	2016-04-12	3	-1/+40
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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	2	-10/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \ \ \	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-11	18	-65/+358
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-08	52	-492/+1306
\| \|\ \ \ \ \ \ \