home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,606 Commits 48 Branches 340 Tags
36ba23d131ce47a37b6e44cbbfa37b69dcdf566e
Commit Graph
1589 Commits
Author SHA1 Message Date
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 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
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master' 
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
 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 
![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif)

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
![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
 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
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
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


![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png)

![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png)

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 

![fixi](/uploads/7733ec714b70b2157104af4b039953c3/fixi.gif)

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
Jacob Schatz 2446f853bd Merge branch 'close-issue-bug' into 'master' 
Fix data check in update issue response



See merge request !3548
 2016-04-05 20:48:00 +00:00
Jacob Schatz a1c794c591 Merge branch 'dropdown-arrow-support' into 'master' 
Dropdown arrow support

When the dropdown is open, you can scroll through the list of items with the up & down arrow keys. When an item is focused, the enter triggers the click event for that row.

Closes #14455

See merge request !3385
 2016-04-05 19:41:22 +00:00
Jacob Schatz 4258589d95 Merge branch 'note-form-design' into 'master' 
Notes form design update

Part of #3401

See merge request !3442
 2016-04-05 19:34:16 +00:00
Annabel Dunstone 33faf219aa Fix data check in update issue response 2016-04-05 11:43:30 -07:00
Phil Hughes 8e3f5ebaa0 CS multiline 2016-04-05 09:07:40 +01:00
Alfredo Sumaran 51b8b8711b Merge branch 'master' into issue_14800 
# Conflicts:
#	app/assets/stylesheets/framework/variables.scss
 2016-04-04 20:06:29 -05:00
Jacob Schatz 2fb0ef51d6 Merge branch 'fix-award-emoji-menu' into 'master' 
Fix award emoji picker for relative_url

MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.

See merge request !3493
 2016-04-04 19:47:15 +00:00
Phil Hughes f62d7d261b Removed console.log from notes 2016-04-04 10:49:08 +01:00
Phil Hughes 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes 3b4c4dd7b3 Logged out box 2016-04-04 10:48:49 +01:00
Phil Hughes 0581df2971 Discussion form 2016-04-04 10:48:49 +01:00
Phil Hughes f0d2f370cc Removed css code that isnt used 2016-04-04 10:48:49 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00