home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,141 Commits 48 Branches 340 Tags
bdb4945dcf3c899c6a88fd42657a1b3f04baced1
Commit Graph
2311 Commits
Author SHA1 Message Date
Douwe Maan a468bf346a Merge branch 'gsmethells/gitlab-ce-sort-by-due-date' 2015-12-07 13:45:16 +01:00
Douwe Maan 4c353143d6 Merge branch 'style-warning-about-mentioning-many-people-in-a-comment' into 'master' 
Style warning about mentioning many people in a comment

Fixes #2885 

* Create issue:

    Before:

    ![Screenshot_2015-12-03_15.23.44](/uploads/6da9b326e47dc5e8c127a581af99403c/Screenshot_2015-12-03_15.23.44.png)

    After:

    ![Screenshot_2015-12-03_15.21.29](/uploads/bbe328d30a32d642c280bf2ad6d2832c/Screenshot_2015-12-03_15.21.29.png)  
      

* New merge request:

    Before:

    ![Screenshot_2015-12-03_15.24.06](/uploads/79d6f8f52ba2753aaecf6b6bbd04f0d0/Screenshot_2015-12-03_15.24.06.png)

    After:

    ![Screenshot_2015-12-03_15.21.48](/uploads/f01ea8e7d058a9f8b803ca1ce4f533ad/Screenshot_2015-12-03_15.21.48.png)
     

* New comment in a merge request:

    Before:

    ![Screenshot_2015-12-03_15.11.23](/uploads/5d958375812d21d41e00694186c7ef7a/Screenshot_2015-12-03_15.11.23.png)

    After:

    ![Screenshot_2015-12-03_15.09.08](/uploads/3d6bde6aad46c7d9e53b70a47eecf7c0/Screenshot_2015-12-03_15.09.08.png)
     

* New diff comment:

    Before:

    ![Screenshot_2015-12-03_15.25.50](/uploads/08ac9c261c1aa9693706da714c121e15/Screenshot_2015-12-03_15.25.50.png)

    After:

    ![Screenshot_2015-12-03_15.46.20](/uploads/07a8b8708ad825eb8cda7e5e40116b81/Screenshot_2015-12-03_15.46.20.png)

See merge request !1971
 2015-12-07 11:09:13 +00:00
Douwe Maan 0bca65b283 Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-date 2015-12-07 12:03:34 +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
Douglas Barbosa Alexandre 29e5506799 Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-comment 2015-12-04 18:11:49 -02: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 eb9601d906 Merge branch 'ui/form-consistency' into 'master' 
UI: Improve form consistency

Depends on !1953

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

# Highlights

## Tag form

Before:

![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png)

After:

![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png)


See merge request !1955
 2015-12-04 09:27:27 +00:00
Douglas Barbosa Alexandre 0decc7f941 Fix specs 2015-12-03 19:46:30 -02:00
Dmitriy Zaporozhets abb7261889 Merge branch 'ui/wiki' into 'master' 
UI: Use new style for wiki

Depends on !1953

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

# Highlights

## Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png)

After:

![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png)

## Edit Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png)

After:

![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png)

See merge request !1967
 2015-12-03 20:17:48 +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
Douglas Barbosa Alexandre 510f3bf70b Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-comment 2015-12-03 16:00:05 -02: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
Douglas Barbosa Alexandre c204aca83b Improve style of the warning when mentioning many people in a comment 2015-12-03 15:30:10 -02:00
Dmitriy Zaporozhets d63d12a526 Merge branch 'ui/milestones' into 'master' 
UI: Use new style for milestone detail page

Depends on !1953

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

Before:

![Screen_Shot_2015-12-02_at_17.47.03](/uploads/62441f50963e0c5d6d04b065573c05f0/Screen_Shot_2015-12-02_at_17.47.03.png)

After:

![Screen_Shot_2015-12-02_at_17.47.22](/uploads/ab29ac0c1819415cc647be173f8c92bd/Screen_Shot_2015-12-02_at_17.47.22.png)


See merge request !1966
 2015-12-03 17:22:34 +00:00
Greg Smethells dbbd2b863b sort milestones by due_date 2015-12-03 08:53:34 -06:00
Douwe Maan 928d131e39 Merge branch 'master' into link-refs 2015-12-03 13:32:42 +01:00
Douwe Maan 97ddf2df00 Merge branch 'master' into ui/wiki 2015-12-03 13:29:35 +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 f3de9d784c Merge branch 'master' into ui/milestones 2015-12-03 13:27:11 +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 0520cd7164 Merge branch 'master' into ui/form-consistency 2015-12-03 13:21:19 +01:00
Douwe Maan 129ad8425e Tweak tag form wording 2015-12-03 13:21:14 +01:00
Valery Sizov b871c38bf2 Fix failures in master 2015-12-03 13:21:30 +02:00
Douglas Barbosa Alexandre f1bbd8119d Style warning about mentioning many people in a comment 2015-12-02 22:03:43 -02:00
Dmitriy Zaporozhets ca7e31c48f Merge branch 'ui/consistency' into 'master' 
UI: Improve consistency across the board

Depends on !1953

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

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577

See merge request !1954
 2015-12-02 22:17:48 +00:00
Douwe Maan f10bd7df90 Tweak merge request list item 2015-12-02 17:37:06 +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 59c3ec4e67 Use file-type specific file icon in blame view and diff item 2015-12-02 14:55:36 +01:00
Douwe Maan a3da3d8e3b Use monospace font for commit SHA in branch list 2015-12-02 14:55:29 +01:00
Douwe Maan 90df3701e7 Add plus icon to all "Add X" buttons 2015-12-02 14:54:50 +01:00
Douwe Maan f8e577591b Don't use success state for "Download zip" button 2015-12-02 14:54:12 +01:00
Douwe Maan 12dd4c7c8a Use "Delete" in milestone and label delete buttons instead of "Remove" 2015-12-02 14:53:56 +01:00
Douwe Maan 67ff47b39c Capitalize tab titles 2015-12-02 14:53:11 +01:00
Douwe Maan 9517b62117 Link MR list item branch name to branch 2015-12-02 14:52:13 +01:00
Douwe Maan 9ea7243092 Fix padding of no readme and empty repo messages 2015-12-02 14:49:46 +01:00
Douwe Maan 1c595681e5 Remove double border between gray blocks 2015-12-02 14:49:29 +01:00
Douwe Maan 3ad1d320ef Remove duplicated styling for center top menus 2015-12-02 14:49:12 +01:00
Douwe Maan 0159d78a3b Remove padding around form-actions 2015-12-02 14:48:06 +01:00
Douwe Maan aa01b23937 Fix padding around editor path, input and select box. 2015-12-02 14:47:19 +01:00
Douwe Maan 3ae7dba931 Use gl-padding instead of 15px/20px where appropriate 2015-12-02 14:46:15 +01:00
Douwe Maan c0e614d1c4 Rename variable 2015-12-02 14:41:57 +01:00
Douwe Maan 8d98245783 Remove .git suffix to project path field. 2015-12-02 14:41:57 +01:00
Douwe Maan dccc227754 Use autofocus where appropriate 2015-12-02 14:41:56 +01:00
Douwe Maan 72ab3b17d3 Use js-requires-input where appropriate 2015-12-02 14:41:56 +01:00
Douwe Maan 2aeb26bd88 Use select2 placeholder instead of blank option 2015-12-02 14:41:56 +01:00
Douwe Maan 9bad736fb3 Remove unnecesary wrapper elements 2015-12-02 14:41:56 +01:00