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
21,077 Commits 48 Branches 340 Tags
419d6fa6b19f2e2ee6429f7db453573155ca2d21
Commit Graph
1289 Commits
Author SHA1 Message Date
Eirik Lygre 419d6fa6b1 Simplify expression per feedback from @rspeicher 2015-12-07 19:24:51 +01:00
Eirik Lygre 88217029fc When rendering the clone page, check user profile to decide default clone protocol. If the user has uploaded SSH-keys, use SSH; otherwise, use http(s). Close #3504. 2015-12-06 20:48:04 +01:00
Robert Speicher d2f9a9012d Merge branch 'link-refs' into 'master' 
Recognize issue/MR/snippet/commit links as references.

Fixes #3744 and #3745

See merge request !1933
 2015-12-04 20:58:45 +00: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 238ca3e472 Merge remote-tracking branch 'origin/ui/issuable-form' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 15:12:03 +01: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
Dmitriy Zaporozhets e7452c6b8f Merge branch 'ui/new-project' into 'master' 
UI: New Project form tweaks

Depends on !1953 

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

Before:

![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png)

After:

![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png)


See merge request !1964
 2015-12-03 19:46:47 +00:00
Dmitriy Zaporozhets 805b4cf522 Merge branch 'ui/issuable-filter' into 'master' 
UI: Issuable filter tweaks

Depends on !1953

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

# Highlights

## Filter bar

Before:

![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png)

After:

![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png)

## Bulk edit bar

Before:

![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png)

After:

![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png)


See merge request !1963
 2015-12-03 19:43:41 +00:00
Dmitriy Zaporozhets 76f0054220 Merge branch 'ui/issuable-list-item' into 'master' 
UI: Issuable list item tweaks

Depends on !1953

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

Before:

![Screen_Shot_2015-12-02_at_17.37.40](/uploads/00ac22d131c49ce548bccd96866cbc75/Screen_Shot_2015-12-02_at_17.37.40.png)

After:

![merge_item_after](/uploads/201d742494596c50bbdb3626f06f65a8/merge_item_after.png)

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2590 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2589

See merge request !1962
 2015-12-03 17:34:30 +00:00
Dmitriy Zaporozhets 68e27b5507 Merge branch 'ui/project-home-panel' into 'master' 
UI: Project home panel tweaks

Depends on !1953

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

Before:

![Screen_Shot_2015-12-02_at_17.46.01](/uploads/f07a4f2370c6863a68df46f655b513c4/Screen_Shot_2015-12-02_at_17.46.01.png)

After:

![Screen_Shot_2015-12-02_at_17.45.40](/uploads/da9b19d3bd89b9421457e0df550efd6e/Screen_Shot_2015-12-02_at_17.45.40.png)


See merge request !1965
 2015-12-03 17:20:55 +00:00
Douwe Maan 928d131e39 Merge branch 'master' into link-refs 2015-12-03 13:32:42 +01:00
Douwe Maan 66a9579712 Merge branch 'master' into ui/sidebar 
# Conflicts:
#	app/assets/stylesheets/framework/sidebar.scss
 2015-12-03 13:29:19 +01:00
Douwe Maan e84edc20c3 Merge branch 'master' into ui/project-home-panel 2015-12-03 13:28:20 +01:00
Douwe Maan fc5afc60ac Merge branch 'master' into ui/new-project 2015-12-03 13:28:08 +01:00
Douwe Maan 00ebe2239b Merge branch 'master' into ui/issuable-list-item 2015-12-03 13:26:02 +01:00
Douwe Maan 879d1f9b76 Merge branch 'master' into ui/issuable-form 2015-12-03 13:25:31 +01:00
Douwe Maan ac8972668f Merge branch 'master' into ui/issuable-filter 2015-12-03 13:24:31 +01:00
Douwe Maan 535d9306c1 Merge branch 'master' into ui/emoji 2015-12-03 13:24:19 +01:00
Douwe Maan 74a81cbfe3 Fix branch rendering 2015-12-02 17:30:50 +01:00
Douwe Maan 854deae412 Brefer "Directory" over "Dir", "Files" over "Code 2015-12-02 14:56:17 +01:00
Douwe Maan e9e9f537e8 Truncate submodule commit SHAs to 7 characters 2015-12-02 14:53:20 +01:00
Douwe Maan 67ff47b39c Capitalize tab titles 2015-12-02 14:53:11 +01:00
Douwe Maan 7a65cb3abf Don't reset target branch when choosing to "Change branches" in MR 2015-12-02 14:23:13 +01:00
Douwe Maan ecd9f5ec02 Add "No Milestone" option to issue milestone select 2015-12-02 14:20:43 +01:00
Douwe Maan d399ffa244 Use "Assigned to USER" tooltip in issue list item 2015-12-02 14:18:46 +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 6252fe4510 Unify new project namespace select and path input 2015-12-02 14:09:59 +01:00
Douwe Maan d65647e90c Add visibility description tooltip to snippet and project visibility labels 2015-12-02 14:08:59 +01:00
Douwe Maan 05224ae64a Restore sidebar tooltips and fix logo tooltip location 2015-12-02 14:05:10 +01:00
Douwe Maan b7cac5a8da Use full names in emoji tooltip 2015-12-02 13:59:21 +01:00
Douwe Maan 8f43298d96 Show local issues and MRs in "This X closes... / closed by..." sentence 2015-11-30 21:09:36 +01:00
Dmitriy Zaporozhets f41634c7f6 Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' 
Show Gmail actions links only on expected set of emails



See merge request !1901
 2015-11-30 09:23:56 +00: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
Stan Hu 2f90e71fd3 Merge pull request #9670 from janten/gravatar-retina 
Add support for HiDPI displays in gravatar service
 2015-11-26 08:13:28 -08:00
Marin Jankovski 5613592727 If action link is not found, return nil. 2015-11-25 13:53:02 +01: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
Robert Speicher acc0f162c8 Move clipboard_button helper to ButtonHelper module 2015-11-24 16:55:26 -05:00
Robert Speicher af65046c5f Move HTTP/SSH clone button logic to helpers 2015-11-24 16:55:26 -05:00
Valery Sizov f31ee52507 Fix for Emoji 2015-11-20 11:13:43 +02: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 3a85c93a7a Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master' 
Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820
 2015-11-19 16:45:45 +00:00
Valery Sizov 23c5473cc0 added spinach tests 2015-11-19 13:20:09 +02:00
Valery Sizov fdd5a8f2e1 addressing comments 2015-11-19 01:26:00 +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 2d1fcd802a Emoji: refactoring 2015-11-19 01:25:59 +02:00
Valery SizovandValery Sizov f021bc5c6a add stats on hover 2015-11-19 01:25:59 +02:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Douwe Maan 40470975e8 Add Project#safe_import_url helper. 2015-11-18 12:00:56 +01: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