home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,219 Commits 48 Branches 340 Tags
b2dc9176018729efc1969035b30017c2ed81a708
Commit Graph
2034 Commits
Author SHA1 Message Date
Jacob Schatz 318b22459b Merge branch 'incremental-fixes' into 'master' 
Fix concurrent request when updating build log in browser

If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535

See merge request !4183
 2016-05-25 11:51:20 +00:00
Phil Hughes 1e45fb2f2d Fixed issue with button color when no CI enabled 
Closes #17844
 2016-05-25 11:08:00 +01:00
Phil Hughes 53866711d4 Show loading indicator for autocomplete 
Closes #15435
 2016-05-25 08:41:04 +01:00
Jacob Schatz c00ba9a632 Merge branch 'scroll-to-changes-content' into 'master' 
Clicking changes tab scrolls the window to show the content

When you click on the changes tab in a merge request, it will now scroll the window down to the content.

![scroll](/uploads/c5db23e1c32b1fe62bf4efb815b3f055/scroll.gif)

Closes #15133

See merge request !4192
 2016-05-24 20:51:25 +00:00
Fatih Acet 20e6e0dbe6 Handle posting emoji only vote +1 and -1 comments. 
And remove mutual votes.
 2016-05-24 20:47:10 +03:00
Fatih Acet b0082bec73 Get award menu url from gl object. 2016-05-24 19:34:08 +03:00
Phil Hughes a29b45b061 Clicking search pill focuses field 
When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field.

Fixed an issue where clicking out of the field wouldn't remove the focus
outline

Also reduced some of the HTML to remove what isn't needed
 2016-05-24 16:59:18 +01:00
Phil Hughes 5cca2d3bb1 Updated Ruby based on feedback 2016-05-24 08:42:52 +01:00
Kamil Trzcinski cdec9e472d Replace \n to <br> 2016-05-23 21:59:07 -05:00
Kamil Trzcinski 46de0366b1 Fix concurrent request when updating build log in browser 2016-05-23 20:57:03 -05:00
Fatih Acet c697c9601d Fix award tooltip after voting. 2016-05-24 03:44:19 +03:00
Fatih Acet 1d7c3c79b1 Handle thumbsup and thumbsdown mutuality. 2016-05-24 03:10:38 +03:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Fatih Acet aa2a7dad59 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643 
# Conflicts:
#	app/assets/stylesheets/pages/issuable.scss
 2016-05-23 23:08:00 +03:00
Fatih Acet 5b046f8571 Fix variable name because of a wrong resolved merge conflict. 2016-05-23 22:38:34 +03:00
Fatih Acet 68c74f9de1 Merge branch 'awardables-merge' of gitlab.com:gitlab-org/gitlab-ce into awardables-merge 
# Conflicts:
#	app/assets/javascripts/notes.js.coffee
 2016-05-23 22:30:20 +03:00
Fatih Acet 85e9eece7e Fix displaying emoji only comments. 
To render emoji in the emoji bar of an issue or MR we actually need the emoji unicode and unicode info is stored in the emoji menu widget. That widget could only be visible if user clicks the "Add" button and there may not be a widget when posting emoji only comments. So this change will check existence of the widget and create it before posting the emoji if it's not exist to render it correctly.
 2016-05-23 21:33:58 +03:00
Fatih Acet e8c8c9d7b2 Fix emoji counter issue. 2016-05-23 21:25:45 +03:00
Phil Hughes d3bdbf55c7 Fixed issue with dropdown not opening after removing due date 2016-05-23 09:33:48 +01:00
Phil Hughes a69ab104de Added remove due date button 
In the sidebar when there is a due date, a link to remove due date becomes visible

Closes #17392
 2016-05-23 08:40:04 +01:00
Jacob Schatz 73403c4ca7 Merge branch 'issuable-new-due-date' into 'master' 
Issuable form due date

For some reason, this was never in the original merge request for due date?

![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png)

Closes #15516

See merge request !3895
 2016-05-21 03:34:43 +00:00
ZJ van de Weg 6d19d6a2fd minor js fixes 2016-05-20 20:17:49 -05:00
Jacob Schatz 98b1daf32d Merge branch 'dropdown-enter-select' into 'master' 
Fixed issue with enter key selecting wrong option in dropdown

If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif)

Closes #17630

See merge request !4210
 2016-05-21 00:11:18 +00:00
Jacob Schatz 9aab0f0973 Merge branch 'merge-immediately-button-color-fix' into 'master' 
Fixed issue with merge button color

![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png)

Closes #17644

See merge request !4211
 2016-05-21 00:08:23 +00:00
Douwe Maan ec86644545 Merge branch 'zj-gitignore-dropdown' 2016-05-20 17:14:22 -05:00
Alfredo Sumaran ab96ca2bf1 Dropdown implementation 2016-05-20 15:58:36 -05:00
Alfredo Sumaran 1f5fcb638d Dropdown implementation 2016-05-20 15:58:36 -05:00
Zeger-Jan van de WegandAlfredo Sumaran fab9dbb3eb First import of gitignores 
Add .gitignore dropdown when creating a new .gitignore file

Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
 2016-05-20 15:58:36 -05:00
Phil Hughes fac08c3bcd Fixed up JS comments 2016-05-20 09:20:35 +01:00
Phil Hughes 9f60a2eda2 Fixed issue with enter key selecting wrong option in dropdown 
If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

Closes #17630
 2016-05-20 08:50:42 +01:00
Phil Hughes ce8dd3bd66 Fixed issue with merge button color 
Closes #17644
 2016-05-20 08:50:09 +01:00
Fatih Acet b40afae62c Add Gitlab namespace AwardEmoji. 2016-05-19 14:18:33 -05:00
Phil HughesandFatih Acet 783a5ae98c Adds the emoji menu to the body and then re-positions it depending on which button clicked 
This spots bugs where the menu could be in a div that has overflow hidden on ie. diff comments
 2016-05-19 14:13:16 -05:00
Phil HughesandFatih Acet 797acde046 Tooltip placement on award buttons 2016-05-19 14:12:59 -05:00
Phil HughesandFatih Acet 7d4f41efde Removed console log 2016-05-19 14:11:27 -05:00
Phil HughesandFatih Acet 9e8449b1af Hides the row in notes body when empty of emojis 2016-05-19 14:11:20 -05:00
Phil HughesandFatih Acet 25a4893215 Removes buttons in notes body 2016-05-19 14:11:10 -05:00
Phil HughesandFatih Acet f2f2e07294 Shows the bar on notes if a new award is added 
Correctly adds/removes awards in notes

# Conflicts:
#	app/models/concerns/awardable.rb
#	app/views/projects/issues/show.html.haml
#	app/views/projects/merge_requests/_show.html.haml
 2016-05-19 14:10:59 -05:00
Phil HughesandFatih Acet 0b45cf55dd Uses the same emoji-menu and just moves it around depending where it should be viewed 
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/assets/stylesheets/pages/notes.scss
#	app/helpers/issues_helper.rb
#	app/views/projects/notes/_note.html.haml
 2016-05-19 14:07:27 -05:00
Phil HughesandFatih Acet 4caf38a1d5 Refactored JS slightly to make things easier 
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/views/emoji_awards/_awards_block.html.haml
 2016-05-19 14:04:48 -05:00
Rémy Coutable f29d8b64e4 Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 23:40:33 -05:00
Phil Hughes 72df2da7c2 Clicking changes tab scrolls the window to show the content 
Closes #15133
 2016-05-18 11:13:57 +01:00
Dmitriy Zaporozhets 5ba5269383 Fix dashboard shortcuts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-17 00:35:16 -05:00
Phil Hughes 5c4416bb45 Loads move issue dropdown async 
Closes #16563
 2016-05-16 15:24:51 +01:00
Phil Hughes 527d644635 Moved into class methods 2016-05-16 12:51:49 +01:00
Phil Hughes 93c0bb8041 Fixed issue with selected date not loading correctly 
Added loading icon to selected date box
 2016-05-16 12:22:17 +01:00
Phil Hughes bef5695a81 Formats tooltip title & date correctly 
Correctly changes the activity when clicking a date - will also revert back to old data when clicking date again
 2016-05-16 12:22:17 +01:00
Phil Hughes 18b361cf80 Group the contributing calendar by day 
This aligns the boxes correctly with the day on the left side of the calendar
 2016-05-16 12:22:17 +01:00
Phil Hughes 36fdbc6edb Updated contrib map away from cal heat map 2016-05-16 12:19:30 +01:00
Phil Hughes 5f66bfe7ed Added due date calendar to new issue form 
Closes #15516
 2016-05-16 10:35:14 +01:00