home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,141 Commits 48 Branches 340 Tags
bdb4945dcf3c899c6a88fd42657a1b3f04baced1
Commit Graph
99 Commits
Author SHA1 Message Date
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
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
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 de3a175486 Merge branch 'ui/login-page' into 'master' 
Fix background and padding of login and error pages

Was gray, is white again.

See merge request !1978
 2015-12-04 09:24:42 +00:00
Douglas Barbosa Alexandre 0decc7f941 Fix specs 2015-12-03 19:46:30 -02: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
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
Douwe Maan 1dd7c97886 Fix background and padding of login and error pages 2015-12-03 18:51:44 +01: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
Grzegorz Bizon 70a076c059 Add new features to javascript flash message 2015-12-03 13:39:00 +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
Dmitriy Zaporozhets bb76a9e2ea Merge branch 'ui/no-minimal-height' into 'master' 
UI: Remove minimum container height

Depends on !1953

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

Before:

![Screen_Shot_2015-12-02_at_15.42.07](/uploads/1d8e19e4738bec39074cbb9afc400ad5/Screen_Shot_2015-12-02_at_15.42.07.png)

After:

![Screen_Shot_2015-12-02_at_15.50.34](/uploads/56153fe19bb72163a2dc9dd83850ad89/Screen_Shot_2015-12-02_at_15.50.34.png)


See merge request !1957
 2015-12-02 22:15:38 +00:00
Douwe Maan acc35a58a7 Revert unrelated changes 2015-12-02 15:52:33 +01:00
Douwe Maan 845f26d07b Remove minimum containe height 2015-12-02 15:49:21 +01:00
Douwe Maan 1fb3c0996a Fix styling of empty repo message 2015-12-02 15:32:45 +01:00
Douwe Maan 9517b62117 Link MR list item branch name to branch 2015-12-02 14:52:13 +01:00
Douwe Maan 8196d269eb No bottom margin for form help blocks 2015-12-02 14:50:50 +01:00
Douwe Maan 09396b2eaa Render all form controls at the same height 2015-12-02 14:50:41 +01:00
Douwe Maan 1c595681e5 Remove double border between gray blocks 2015-12-02 14:49:29 +01:00
Douwe Maan 0159d78a3b Remove padding around form-actions 2015-12-02 14:48:06 +01:00
Douwe Maan c95b64d1ca Fix alignment of buttons in issue header 2015-12-02 14:46:55 +01:00
Douwe Maan 3ae7dba931 Use gl-padding instead of 15px/20px where appropriate 2015-12-02 14:46:15 +01:00
Douwe Maan 58dad2a9da Remove bottom margin from page-titles 2015-12-02 14:43:23 +01:00
Douwe Maan 3b03987a27 Redesign multiple select2 options 2015-12-02 14:24:44 +01:00
Douwe Maan 5d0ab2b9e9 Make style of select2 box more consistent with controls 2015-12-02 14:16:17 +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 112cca872b Move project visibility status to the left 2015-12-02 14:07:21 +01:00
Douwe Maan 1ef01e4f6a Fade in/out Back icon when sidebar is toggled 2015-12-02 14:06:11 +01:00
Douwe Maan 5c771cca33 Fix logo height in signed-out header bar 2015-12-02 14:05:24 +01:00
Douwe Maan 05224ae64a Restore sidebar tooltips and fix logo tooltip location 2015-12-02 14:05:10 +01:00
Dmitriy Zaporozhets d9749c8d36 Improve UI for group members page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets d1a7356398 Fix ultra-light color for small text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 11:36:53 +01:00
Stan Hu ab238a7677 Fix CSS styling for clipboard icon in new MR page 
Closes #3602
 2015-11-22 07:23:56 -08:00
Greg Smethells d22435f3ff fix syntax error in common.scss 2015-11-20 14:15:01 -06:00
Douwe Maan 5036d8d5d5 Fix styling of import error. 2015-11-18 12:02:09 +01:00
Douwe Maan 01d2b1943f Move import form to partial. 2015-11-18 12:00:56 +01:00
Dmitriy Zaporozhets aec9f211e5 Merge branch 'impersonate' into 'master' 
refactor login as to be impersonation with better login/logout

Modifies the existing "login as" feature to be called impersonation.

This also adds:

* Application keep track of who is impersonating the user so they can revert back to the original user without having to log out.
* Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop.

## Screenshots:

![](http://sindacio.us/i/2015-10-28_17-52-41.png)
![](http://sindacio.us/i/2015-10-28_17-53-08.png)

See merge request !1702
 2015-11-14 09:04:10 +00:00
Robert Speicher afcced01e5 Remove text-rendering property 
Closes #3220

[ci skip]
 2015-11-10 13:15:18 -05:00
Stan Hu 99c05363ea Remove CSS property preventing hard tabs from rendering in Chromium 45 
This is to workaround a bug in Chromium 45 (https://code.google.com/p/chromium/issues/detail?id=446434),
which is the default browser in Ubuntu 14.04 and older.

Closes #3220
 2015-11-10 07:19:31 -08:00
Dmitriy Zaporozhets 354b69dde2 Merge remote-tracking branch 'origin/release-notes' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-10 10:20:22 +01:00
Dmitriy Zaporozhets 4099751ce9 Render same markdown hint for issue, merge request, wiki and comment forms 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-07 20:22:16 +01:00