home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,370 Commits 48 Branches 340 Tags
f3d4f2eac7bcf787a00a6cff694fbfa8969830f4
Commit Graph
204 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9bf47f06ab Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' 
Makes ol margin big enough for 3 digits.

Fixes #7960 

![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png)


See merge request !2608
 2016-01-28 13:07:26 +00:00
Jacob Schatz a98bf00ca6 Adds margin top to readme holder so not flush. 2016-01-26 14:51:55 -05:00
Jacob Schatz 2cc20853c9 adds border color to tables globally. 2016-01-26 14:40:52 -05:00
Jacob Schatz 2b98b7faa1 Revert "Styles for file list change." 
This reverts commit a14089485f.
 2016-01-26 11:52:30 -05:00
Jacob Schatz 9a1ec97fc4 Revert "Adjusts styles of table tree" 
This reverts commit 111834883d.
 2016-01-26 11:52:09 -05:00
Jacob Schatz 111834883d Adjusts styles of table tree 
Fixes #12725
 2016-01-26 11:21:09 -05:00
Jacob Schatz a14089485f Styles for file list change. 
New download btn WIP.
 2016-01-26 08:45:18 -05:00
Jacob Schatz 9b7dd5a4ee Makes ol margin big enough for 3 digits. 
Fixes #7960
 2016-01-25 23:20:31 -05:00
Robert Speicher 68ad3180b3 Merge branch 'note-highlighting' into 'master' 
Highlight note code and edit preview

More highlighting fixes! Highlighting wasn't applied all the way for
code in notes, diff notes diffs and diff preview (on the file edit page).

The CSS changes further unify the styling for file-content highlighting,
diff highlighting and note code highlighting.

See merge request !2594
 2016-01-25 23:43:44 +00:00
Douwe Maan 40d2daed89 Highlight note code and edit preview 2016-01-25 11:42:47 +01:00
Jacob Schatz a80d55b766 Border radius to vars. 
Only top search is gray.
 2016-01-24 20:20:03 -05:00
Jacob Schatz c10705c59f Distinguishes between search inputs. 
Main search input has different styles than secondary search inputs.
 2016-01-24 20:20:03 -05:00
Jacob Schatz dd8e9a28e7 Removes extra spaces 2016-01-24 20:20:03 -05:00
Jacob Schatz 75c93bb20d Make base64 image smaller by 5000 characters. 2016-01-24 20:20:03 -05:00
Jacob Schatz d3f24a2221 Adds base64 background search icon. 
All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own value.
 2016-01-24 20:20:03 -05:00
Jacob Schatz 0ee2d50eee Merge branch 'issuable-white-bg' into 'master' 
Remove gray background from issue/mr/milestone background

Fixes #6062 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
cc @skyruler @creamzy 

See merge request !2573
 2016-01-23 05:41:00 +00:00
Dmitriy Zaporozhets 367cd8ac75 Remove gray background from issue/mr/milestone background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 16:15:32 -08:00
Dmitriy Zaporozhets cf673ba9f6 Fix UI for pages with panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 13:37:40 -08:00
Robert Speicher 307b099064 Merge branch 'diff-highlight-themes' into 'master' 
Diff highlight themes

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

See merge request !2530
 2016-01-21 23:16:22 +00:00
Phil Hughes ad9799bdb0 Milestone drag & drop cursor 
Fixes #4097
 2016-01-21 14:17:59 +00:00
Douwe Maan 21facf5353 Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets 2016-01-21 14:23:53 +01:00
Jacob Schatz ceab12866f Removes 100% width because it is a block element. 2016-01-20 21:27:01 -05:00
Dmitriy ZaporozhetsandJacob Schatz 8367e4abeb Implement new UI for pagination 2016-01-20 21:27:01 -05:00
Dmitriy Zaporozhets 340df52bc7 Merge branch 'display-message-when-assignee-cannot-merge' into 'master' 
adds exclamation point when assigned user cannot merge

Fixes: #4175 

See merge request !2408
 2016-01-19 17:35:29 +00:00
Jacob Schatz f5562355f4 Move multiple css rules to multiple lines. 
Removes extra line breaks.
 2016-01-19 08:44:16 -05:00
Jacob Schatz 8b3d679345 color variable for error for exclamation point 2016-01-18 20:12:06 -05:00
Jacob Schatz 1133251f08 Reduce margin to fit dropdowns 
Fixes #10747
 2016-01-18 19:54:37 -05:00
Jacob Schatz d04eadf822 Merge branch 'fix-alignment-issue' into 'master' 
Fix alignment issues after a fix on titles weight

Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/

## Commit title alignment fixed

![Screen_Shot_2016-01-14_at_16.10.01](/uploads/8fdc08dca379bc551f5872de910c7149/Screen_Shot_2016-01-14_at_16.10.01.png)

**The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).**

## Tags name in list

![Screen_Shot_2016-01-14_at_16.10.09](/uploads/fba3978037677bb8855f374b5f38dde0/Screen_Shot_2016-01-14_at_16.10.09.png)

See merge request !2431
 2016-01-15 16:34:48 +00:00
Rémy Coutable a69271374d Streamline item titles to use a single class, and add back strong tags 2016-01-15 11:10:55 +01:00
Robert Speicher 6fd92ad4a9 Prefer custom WOFF2 fonts if the browser supports them 
[ci skip]
 2016-01-14 17:33:54 -05:00
Dmitriy Zaporozhets 49c310e45c Fix missing padding for user/group pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 16:42:25 +01:00
Dmitriy Zaporozhets fc9a2a3e70 Merge remote-tracking branch 'origin/rs-autosize' 2016-01-14 16:19:16 +01:00
Dmitriy Zaporozhets 33ccee239e Merge branch 'new-buttons-everywhere' into 'master' 
Standartize buttons and fields size

Fixes #8069 and #8070

See merge request !2428
 2016-01-14 14:19:32 +00:00
Dmitriy Zaporozhets 620d8b68a1 Merge branch 'remove-gray-bg' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 14:09:49 +01:00
Dmitriy Zaporozhets f414928a54 Standartize buttons and fields size 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 13:59:28 +01:00
Dmitriy Zaporozhets bb5213588b Update files/diffs to match new layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 12:31:31 +01:00
Douwe Maan 4d64a32c88 Merge branch 'feature/ldap-sync-edgecases' into 'master' 
LDAP Sync blocked user edgecases

Allow GitLab admins to block otherwise valid GitLab LDAP users
(https://gitlab.com/gitlab-org/gitlab-ce/issues/3462)

Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other.

Expected behavior:

- [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?`
- [x] "ldap_blocked" users can't be unblocked by the Admin UI
- [x] "ldap_blocked" users can't be unblocked by the API
- [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked"
- [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization
- [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked`
 
Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:
![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png)

There will be another MR for the EE version.

See merge request !2242
 2016-01-14 11:00:08 +00:00
Dmitriy Zaporozhets 966c4f3392 Fix files, project settings and few more pages with new layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 11:55:15 +01:00
Gabriel Mazetto fc7e6e8ffc Fix Admin/Users view to position buttons without spacing magic 2016-01-14 03:08:40 -02:00
Robert Speicher 552c179acd Autosize textareas 2016-01-13 14:51:07 -05:00
Robert Speicher 1c7febc3e3 Style the broadcast message form 2016-01-13 11:34:19 -05:00
Dmitriy Zaporozhets f956514b10 Dont use nav-pills. Instead use nav-lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 17:26:45 +01:00
Dmitriy Zaporozhets 3238b0bc9f Replace nav-tabs with nav-links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 17:13:36 +01:00
Dmitriy Zaporozhets cf1a62e236 Add top margin for page title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 17:01:11 +01:00
Dmitriy Zaporozhets 0673fad893 Apply new layout to user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 16:26:40 +01:00
Dmitriy Zaporozhets c44b927bc0 Allign md header components 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 16:10:06 +01:00
Dmitriy Zaporozhets 03090a88d8 Replace all navigation menu with nav-links class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 15:58:04 +01:00
Dmitriy Zaporozhets 8c3debb18a Start moving all navigation to one class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 15:03:32 +01:00
Dmitriy Zaporozhets 3b3f755b5b New layout without background color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 14:37:25 +01:00
Jacob Schatz e74e03fa66 changes $quote-gray to $secondary-text 2016-01-12 20:51:13 -05:00