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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'project-title-dropdown' into 'master'	Jacob Schatz	2016-04-12	2	-0/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Project dropdown in header uses new dropdown See merge request !3339
\| *	Updated based on Ruby feedback	Phil Hughes	2016-04-12	1	-5/+6
\| \|
\| *	Updated tests	Phil Hughes	2016-04-12	1	-1/+1
\| \|
\| *	Project dropdown in header uses new dropdown	Phil Hughes	2016-04-12	2	-0/+9
\| \|
* \|	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	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix quick submit missing in edit merge request page closes #14953 ![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif) See merge request !3601
\| * \|	fix quick submit missing in edit merge request page	Arinde Eniola	2016-04-07	1	-1/+1
\| \| \|
* \| \|	Merge branch 'decouple-member-notification' into 'master'	Douwe Maan	2016-04-12	6	-88/+85
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Simplify Projects::NotificationSettingsController	Douglas Barbosa Alexandre	2016-04-12	1	-1/+1
\| \| \| \|
\| * \| \|	Fix partial for update project notifications	Douglas Barbosa Alexandre	2016-04-11	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-11	47	-257/+146
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-08	40	-228/+271
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Change how notification settings in profile are rendered and updated	Dmitriy Zaporozhets	2016-03-30	5	-58/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Improve project notification settings explanation	Dmitriy Zaporozhets	2016-03-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Create NotificationSettings object only when user change value in dropdown	Dmitriy Zaporozhets	2016-03-30	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Introduce NotificationSetting to user interface	Dmitriy Zaporozhets	2016-03-30	3	-39/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* visiting project will create notification setting if missing * change notification setting per project even without membership * use notification settings instead of membership on profile page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'commit-message-prefilled' into 'master'	Jacob Schatz	2016-04-12	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefills commit message in edit file See #14488 ![Screen_Shot_2016-04-06_at_10.18.06](/uploads/2ace2a21a6ead8d83c79ef9ce5dd34cc/Screen_Shot_2016-04-06_at_10.18.06.png) See merge request !3564
\| * \| \| \| \|	Added back text used on merge commit messagecommit-message-prefilled	Phil Hughes	2016-04-11	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Prefills commit message in edit file	Phil Hughes	2016-04-11	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	See #14488
* \| \| \| \|	Merge branch 'build-notification-fixes' into 'master'	Jacob Schatz	2016-04-12	1	-7/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build notification null check Cancels build notification interval on page change See merge request !3540
\| * \| \| \| \|	Fixed failing testsbuild-notification-fixes	Phil Hughes	2016-04-11	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Preparing build text	Phil Hughes	2016-04-11	1	-1/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Build notification null check	Phil Hughes	2016-04-11	1	-6/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cancels build notification interval on page change
* \| \| \| \|	hide help block when user is creating a new project inside a group	Arinde Eniola	2016-04-12	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'rs-form_errors' into 'master'	Dmitriy Zaporozhets	2016-04-11	31	-153/+41
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	31	-153/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	9	-77/+79
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \|	Addressed feedback	Phil Hughes	2016-04-11	2	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed important from css
\| * \| \| \| \|	Fixed builds	Phil Hughes	2016-04-06	2	-12/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed target project update	Phil Hughes	2016-04-06	3	-12/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Checkmarks in dropdowns for already selected values	Phil Hughes	2016-04-06	1	-7/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Use new dropdowns for MR compare	Phil Hughes	2016-04-06	1	-8/+47
\| \| \| \| \| \|
\| * \| \| \| \|	Updated UI for new merge request	Phil Hughes	2016-04-06	6	-55/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2540
* \| \| \| \| \|	Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master'	Jacob Schatz	2016-04-11	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent users from being able to both upvote and downvote See merge request !3495
\| * \| \| \| \| \|	prevent users from being able to both upvote and downvote	Arinde Eniola	2016-04-09	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-markdown-preview-tabindex' into 'master'	Jacob Schatz	2016-04-10	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tab stop from "Write", "Preview", "Go full screen" links Closes #15089 See merge request !3635
\| * \| \| \| \| \| \|	Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindex	Robert Speicher	2016-04-09	1	-3/+3
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15089
* \| \| \| \| \| \|	Merge branch 'redesign_labels_page' into 'master'	Jacob Schatz	2016-04-10	2	-8/+12
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
\| * \| \| \| \| \|	fix the failing tests and some changes	Arinde Eniola	2016-04-06	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	finish up the design and add info to the changelog	Arinde Eniola	2016-04-06	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	change the subscribe, delete and edit buttons to icons	Arinde Eniola	2016-04-06	2	-8/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '14400-diff-redesign' into 'master'	Jacob Schatz	2016-04-09	5	-18/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Diff redesign Fixes #14400 Fixes #13500 ![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif) See merge request !3476
\| * \| \| \| \| \| \|	Remove comment count & icon from side by side view14400-diff-redesign	Annabel Dunstone	2016-04-07	1	-6/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Diff touch ups	Annabel Dunstone	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove comment count & icon	Annabel Dunstone	2016-04-07	1	-3/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Diff design updates	Annabel Dunstone	2016-04-07	1	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update diff colors and icons	Annabel Dunstone	2016-04-07	2	-3/+3
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'efficient-emoji-loading' into 'master'	Robert Speicher	2016-04-09	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only load emoji spritesheet when necessary On a normal issue where the only award emoji displayed by default are the thumbs-up and thumbs-down emoji, this decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334. See merge request !3449
\| * \| \| \| \| \| \|	Add "sprite" parameter to emoji_icon helper	connorshea	2016-04-08	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The emoji_icon helper used to display the award emoji in Issue and Merge Request views. By default the spritesheet is used, but passing `sprite: false` to the `emoji_icon` helper makes the emoji render as separate images. For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and any that have been awarded to the issue/MR) the independent images are used. Only when the full emoji menu is opened does the full spritesheet load. On a normal issue this change decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334.