1606 Commits

Include renames

Author	SHA1	Message	Date
Robert Speicher	34d7619a1c	Merge branch 'carousel-remove' into 'master' ... 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	2016-04-13 14:51:51 +00:00
Jacob Schatz	f026e53c4d	Merge branch 'label-filter' into 'master' ... Fixed not being able to filter by any or no labels Brings back the options to filter by any or no label Closes #15008  See merge request !3589	2016-04-13 13:24:44 +00:00
connorshea	d8296f8738	Remove Bootstrap Carousel ... 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.	2016-04-12 16:14:15 -06:00
Douglas Barbosa Alexandre	6a238c37e0	Fix todo_target_path for todos where target was removed	2016-04-12 18:06:52 -03:00
Jacob Schatz	20418dc7da	Merge branch 'issue_14206' into 'master' ... Fix datetimes on tooltips Closes #14206 Updates tooltip datetimes on `.timeago()` instances. **Inline notes**  **Existing and new notes**  **Issuable dates**  **Build dates**  See merge request !3497	2016-04-12 19:28:55 +00:00
Phil HughesandJacob Schatz	dca50ac1d4	Project dropdown in header uses new dropdown	2016-04-12 13:10:43 -04:00
Douwe Maan	4516f40dfe	Merge branch 'decouple-member-notification' into 'master' ... 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	2016-04-12 16:39:40 +00:00
Jacob Schatz	63265243b5	Merge branch 'build-notification-fixes' into 'master' ... Build notification null check Cancels build notification interval on page change See merge request !3540	2016-04-12 15:49:33 +00:00
Arinde Eniola	050110c9c9	hide help block when user is creating a new project inside a group	2016-04-12 14:41:34 +01:00
Phil Hughes	a6ba94dbd1	Filtering by any label keeps the text on the toggle button	2016-04-12 09:32:12 +01:00
Alfredo Sumaran	4472752595	Merge branch 'master' into issue_14206	2016-04-11 16:45:58 -05:00
Alfredo Sumaran	38a4f5cec6	Rename method and initialize .timeago inside	2016-04-11 16:45:03 -05:00
Phil Hughes	6a13b37222	Fixed missed conflict	2016-04-11 17:20:47 +01:00
Phil Hughes	843bc44aa9	Preparing build text	2016-04-11 17:20:47 +01:00
Phil Hughes	552cde76fa	Hides notification after X amount of seconds	2016-04-11 17:20:47 +01:00
Phil Hughes	99fe9c7b77	Corrects the button color on build status change	2016-04-11 17:20:47 +01:00
Phil Hughes	60fd4188a5	Build notification null check ... Cancels build notification interval on page change	2016-04-11 17:20:47 +01:00
Jacob Schatz	4087bd16e8	Merge branch 'dashboard-filter-milestone' into 'master' ... Fixed issue with dashboard/issues not filtering by milestone Closes #15128 See merge request !3650	2016-04-11 13:56:29 +00:00
Douglas Barbosa Alexandre	9a44d6977a	Merge branch 'master' into decouple-member-notification	2016-04-11 10:34:49 -03:00
Jacob Schatz	69a8bf367c	Merge branch 'mr-ui-update' into 'master' ... Updated UI for new merge request Closes #2540   See merge request !3228	2016-04-11 11:25:40 +00:00
Phil Hughes	2f4dc45da2	Fixed issue with dashboard/issues not filtering by milestone ... Closes #15128	2016-04-11 11:38:24 +01:00
Phil Hughes	643fe43d78	Addressed feedback ... Removed important from css	2016-04-11 09:43:59 +01:00
Jacob Schatz	6e47f30932	Merge branch 'issue_14353' into 'master' ... Ignore toggling the sidebar for resolutions over 1200px width Closes #14353  See merge request !3547	2016-04-11 00:40:54 +00:00
Jacob Schatz	d2c9137fea	Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master' ... prevent users from being able to both upvote and downvote See merge request !3495	2016-04-11 00:28:12 +00:00
Alfredo SumaranandJacob Schatz	836301676a	Use existence operator instead	2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz	fe0aa82325	Check existence of variable method ... This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.	2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz	a7c11fe473	Ignore toggling sidebar for above 1200px resolution	2016-04-10 20:03:36 -04:00
Jacob Schatz	283ecf6e48	Merge branch 'redesign_labels_page' into 'master' ... Redesign labels page closes #14227 ## Desktop  ## Mobile  See merge request !3507	2016-04-10 14:05:22 +00:00
Arinde Eniola	b95c9217b7	prevent users from being able to both upvote and downvote	2016-04-09 23:31:45 +01:00
Douglas Barbosa Alexandre	7afeace354	Merge branch 'master' into decouple-member-notification	2016-04-08 15:48:09 -03:00
Annabel Dunstone	f9014e4ec6	Use meta key to open todo in new tab	2016-04-08 09:46:32 -07:00
Jacob Schatz	f2b7cd4435	Revert "Merge branch 'new-navigation-prototype' into 'master'" ... This reverts merge request !3494	2016-04-07 21:20:16 +00:00
Alfredo Sumaran	3440c0e61f	Update datetime in .timeago elements ... This should be done before .timeago() is called on the element	2016-04-07 12:02:43 -05:00
Alfredo Sumaran	b19ccdeed4	Add datetime_utility.js.coffee	2016-04-07 12:00:19 -05:00
Jacob Schatz	b471c76bcb	Reset MR opts	2016-04-06 21:46:12 -04:00
Jacob Schatz	b6d5fcd477	Merge branch 'issue_14800' into 'master' ... Search Design fixes Closes #14800 - Use colors according to design - Fix width of search input   See merge request !3475	2016-04-06 21:26:56 +00:00
Alfredo Sumaran	d1ad639010	Do not fire blur event when clicking a suggestion	2016-04-06 14:28:15 -05:00
Arinde Eniola	ffe2f8e679	fix the failing tests and some changes	2016-04-06 20:27:30 +01:00
Arinde Eniola	8d28f94e7b	finish up the design and add info to the changelog	2016-04-06 20:27:30 +01:00
Jacob Schatz	452d1d4a8c	Merge branch 'dropdown-enter-select-fix' into 'master' ... Fixed issue with enter key not selecting correct value in dropdown See merge request !3563	2016-04-06 19:16:23 +00:00
Alfredo Sumaran	5f4ce722c0	Display clear button only if input has a value	2016-04-06 13:55:49 -05:00
Alfredo Sumaran	ee87d15cf4	Change approach, do not use timeouts	2016-04-06 13:23:18 -05:00
Jacob Schatz	77e178b5e1	Merge branch 'fix_missing_filters_on_status_tab_change' into 'master' ... Fix missing filters on status tab when user swithches to another state closes #14769  See merge request !3482	2016-04-06 17:21:25 +00:00
Phil Hughes	fe811a7cdb	Removed un-used get request	2016-04-06 11:08:40 +01:00
Phil Hughes	1af1b6c8d3	Fixed target project update	2016-04-06 11:08:40 +01:00
Phil Hughes	beab104da8	Filters by text on element	2016-04-06 11:08:40 +01:00
Phil Hughes	b310058998	Use new dropdowns for MR compare	2016-04-06 11:08:40 +01:00
Phil Hughes	c5c05f6a04	Updated UI for new merge request ... Closes #2540	2016-04-06 11:08:40 +01:00
Phil Hughes	d6f276eacf	Fixed issue with enter key not selecting correct value in dropdown	2016-04-06 10:05:39 +01:00
Alfredo Sumaran	7baebd3220	Do not create input if fieldName is not defined	2016-04-05 19:18:34 -05:00