home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
1177 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 9e5ac7285c Ensure notes are replaced on a merge request diff when they're updated 2015-12-09 11:30:21 -02:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
 2015-12-08 22:26:29 +01:00
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 18:50:02 +01:00
Dmitriy Zaporozhets 98368d6ec8 Merge branch 'fix-broken-group-avatar-upload' into 'master' 
Fix broken group avatar upload

Closes #3918

See merge request !2018
 2015-12-08 17:02:50 +00:00
Stan Hu 3d654cc0fa Fix broken group avatar upload 
Closes #3918
 2015-12-08 07:52:08 -08:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Douwe Maan 1567572e79 Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
Douwe Maan 3c80a54315 Merge branch 'master' into ui/misc 2015-12-08 12:50:25 +01:00
Dmitriy Zaporozhets bdb4945dcf Fix random failing test - delete attachment 
Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-07 23:40:17 +01:00
Douwe Maan 6fb90a2ca3 Include groups in dashboard "New Milestone" select. 2015-12-07 17:24:15 +01:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan cbcb8dbe70 Use select2 dropdown for dashboard/group 'New X' buttons 2015-12-07 17:12:04 +01:00
Douwe Maan dddfbb653e Merge branch 'master' into ui/misc 2015-12-07 13:48:18 +01:00
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' 
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
 2015-12-07 12:26:56 +00:00
Grzegorz Bizon bfe91b692a Remove space before exclamation mark in award alert 
[ci skip]
 2015-12-05 22:18:13 +01:00
Andrew Tomaka 1c53dc28b5 Notify user if they cannot create projects 2015-12-05 11:32:08 -05:00
Rubén Dávila aa1ba00936 Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 2015-12-04 10:43:33 -05:00
Dmitriy Zaporozhets abf54f230e Merge branch 'ui/sidebar' into 'master' 
UI: Sidebar & header tweaks and fixes

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png)

![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png)

Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573

See merge request !1958
 2015-12-04 09:31:28 +00:00
Grzegorz Bizon 7af67f619a Combine new javascript Flash methods into one 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 554f468462 Pin flash message to top if award note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 70a076c059 Add new features to javascript flash message 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 6fc1b94856 Show flash message instead of alert when note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon a527f5c27f Notify user when award-emoji comment is invalid 2015-12-03 13:38:59 +01:00
Grzegorz Bizon c92b6e66dc Scroll to awards after adding emoji-award comment 
This makes it more intuitive, as user can see that something actually
happened after adding emoji-only comment in long discussions.
 2015-12-03 13:38:59 +01:00
Douwe Maan c12e4de50c Move "Start new merge request" checkbox closer to New branch field 2015-12-02 14:57:38 +01:00
Douwe Maan af541515fa Remove "none" username for "Unassigned" and "Any User" select options 2015-12-02 14:15:08 +01:00
Douwe Maan a895d5d3b2 Use select2 for bulk issue edit status 2015-12-02 14:10:32 +01:00
Douwe Maan 05224ae64a Restore sidebar tooltips and fix logo tooltip location 2015-12-02 14:05:10 +01:00
Dmitriy Zaporozhets 0a1b50ef3f Merge branch 'rs-clone-panel' into 'master' 
Add clipboard button for project clone panel

Closes #3585 

Project:

![Screen_Shot_2015-11-24_at_7.34.04_PM](/uploads/8bf73a2816f2525896023c36aea402bc/Screen_Shot_2015-11-24_at_7.34.04_PM.png)

Wiki:

![Screen_Shot_2015-11-24_at_7.34.43_PM](/uploads/ddf400a1c979a1d8b535a34877cd6163/Screen_Shot_2015-11-24_at_7.34.43_PM.png)


See merge request !1896
 2015-11-30 09:17:39 +00:00
Robert Speicher 73eca2a95e Decouple Markdown previews from DropzoneInput 2015-11-25 16:36:04 -05:00
Robert Speicher 637e64c244 Clean up the Git protocol switcher JS 
Also re-adds the `.clone` updating that was removed accidentally.
Thanks, tests!
 2015-11-24 20:38:36 -05:00
Robert Speicher 1d80cd315e Add clipboard button to project clone panel 
Closes #3585
 2015-11-24 19:32:06 -05:00
Robert Speicher 7dab8ed739 Rework the copy_to_clipboard logic 
It needed to be more flexible in how we set the target text or element.
 2015-11-24 19:12:03 -05:00
Douwe Maan 9a273dbe34 Merge branch 'issue-2831' into 'master' 
Fix Assignee selector when 'Unassigned' #2831

Fixes #2831 

![Screen_Shot_2015-11-21_at_12.04.42_AM](/uploads/e3cb98ff805366805f4a989d927e3f10/Screen_Shot_2015-11-21_at_12.04.42_AM.png)


See merge request !1860
 2015-11-23 10:51:06 +00:00
Valery Sizov 3fc10d46f1 Emoji bug: Invalid url to image 2015-11-22 01:51:00 +02:00
Jose Corcuera be045553ea Fix Assignee selector when 'Unassigned' #2831 2015-11-20 23:55:17 -05:00
Valery Sizov f31ee52507 Fix for Emoji 2015-11-20 11:13:43 +02:00
Robert Speicher b3cd7243e9 Merge branch 'rs-safari-clipboard-fallback' into 'master' 
Add a fallback for Safari copy-to-clipboard

Also, hide the tooltip in a less stupid way.

Closes #3547

See merge request !1844
 2015-11-19 23:23:31 +00:00
Dmitriy Zaporozhets 68d4ab2381 Merge branch 'emoji_votes' into 'master' 
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
 2015-11-19 21:34:38 +00:00
Robert Speicher 2a3680219b Add a fallback for Safari copy-to-clipboard 
Also, hide the tooltip in a less stupid way.

Closes #3547
 2015-11-19 16:06:53 -05:00
Valery Sizov bdf4007cb7 adressing comments 2015-11-19 18:12:17 +02:00
Valery Sizov 23c5473cc0 added spinach tests 2015-11-19 13:20:09 +02:00
Valery Sizov 23df515fd0 Emoji: fix image of emoji when it is submitted via comment 2015-11-19 01:26:00 +02:00
Valery SizovandValery Sizov f021bc5c6a add stats on hover 2015-11-19 01:25:59 +02:00
Valery Sizov 36d0442e83 replace emoji references from class name to data [ci skip] 2015-11-19 01:25:59 +02:00
Valery Sizov 06a4fd1035 css improvements 2015-11-19 01:25:59 +02:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Douwe Maan e86d53b27f Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit 2015-11-18 11:17:20 +01:00
Robert Speicher 354f244059 Merge branch 'contributor-graph-by-email' into 'master' 
See merge request !1705
 2015-11-17 13:48:28 -05:00