home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,878 Commits 48 Branches 340 Tags
baef6728fa4e8e515ccdeba1ea54da996f322aab
Commit Graph
523 Commits
Author SHA1 Message Date
Jacob Schatz 510b10583c Add nice new Todo bell 2016-05-06 11:47:43 -04:00
Dmitriy Zaporozhets b1230bbda6 Merge branch 'group-navigation-redesign' into 'master' 
Redesign navigation for group pages

Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request 

See merge request !3980
 2016-05-06 14:06:02 +00:00
Annabel Dunstone c24958365f Remove mobile styles; horizontally scroll layout nav links 2016-05-05 09:00:29 -05:00
Dmitriy Zaporozhets 3592a59715 Merge branch 'master' into group-navigation-redesign 2016-05-05 11:44:03 +02:00
Annabel Dunstone 3a3f0bf436 Change build icons into buttons; update tests 2016-05-04 16:45:37 -05:00
Annabel Dunstone fc20639c8d Builds page redesign 2016-05-04 16:45:37 -05:00
Annabel Dunstone 7878eb9fa6 Start builds redesign 2016-05-04 16:45:37 -05:00
Annabel Dunstone ccd9c4be00 Reduce height of nav to 50px 2016-05-04 15:50:30 -05:00
Annabel Dunstone 4ed9e5f5be Update font colors, font sizes, caret icon, avatar size 2016-05-04 13:11:38 -05:00
Annabel Dunstone 003b36b45f Fixed layout nav, revert back to badge styles, general enhancements 2016-05-04 11:43:47 -05:00
Annabel Dunstone 21ccf89685 Redesign profile page and group page mobile navigation 2016-05-03 15:29:11 -05:00
Annabel Dunstone f53557a4fa Group navigation design update 2016-05-03 12:36:04 -05:00
Dmitriy Zaporozhets 606e09c141 Fix table borders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-02 19:52:46 +02:00
Dmitriy Zaporozhets b0cfd2a9c5 Use correct border color between table rows 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-02 19:37:22 +02:00
Dmitriy Zaporozhets f3f820d0bd Move modal css to separate file and fix danger text for confirmation modal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-29 19:02:30 +02:00
Dmitriy Zaporozhets 9ef18c6c8b Replace outdated bluish colors with default bg color 2016-04-28 23:06:00 +02:00
Jacob Schatz 73990df32f Merge branch 'async-new-branch-button' into 'master' 
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
 2016-04-28 21:00:22 +00:00
Jacob Schatz 14c2c573a3 Merge branch 'project-webhooks-ui' into 'master' 
Project webhooks updated UI

Closes #13993 

![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png)

![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png)

See merge request !3922
 2016-04-28 20:16:36 +00:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously 
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
 2016-04-28 16:13:48 -04:00
Jacob Schatz 48076c9808 Merge branch 'updated-triggers-ui' into 'master' 
Updated triggers UI

![Screen_Shot_2016-04-27_at_14.05.35](/uploads/971bc907f62abd397368c8c088ff0cf1/Screen_Shot_2016-04-27_at_14.05.35.png)

![Screen_Shot_2016-04-27_at_14.05.32](/uploads/5e0e87998e25e7e89cdd6fb8d6035542/Screen_Shot_2016-04-27_at_14.05.32.png)

Closes #14090

See merge request !3946
 2016-04-28 19:14:41 +00:00
Jacob Schatz 973b948b9e Merge branch 'project-group-ui' into 'master' 
Project group UI

Closes #13991 

![Screen_Shot_2016-04-25_at_14.54.49](/uploads/e55fd1731a479d93660a1ff8359f56d6/Screen_Shot_2016-04-25_at_14.54.49.png)

See merge request !3911
 2016-04-28 16:44:41 +00:00
Dmitriy Zaporozhets 435b1c043e Reuse more popular colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-28 17:03:03 +02:00
Dmitriy Zaporozhets 4a3f3bc702 Make layout navigation gray and fluid 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-28 14:23:25 +02:00
Dmitriy Zaporozhets adc296e936 Make application header light gray 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-28 14:13:37 +02:00
Phil Hughes 1cf8723d2f Updated triggers UI 
Closes #14090
 2016-04-27 14:07:11 +01:00
Phil Hughes 420b95bd4d Changed settings icon color variable 2016-04-27 09:11:11 +01:00
Phil Hughes 4c772d9bc8 Project webhooks updated UI 
Closes #13993
 2016-04-26 10:56:18 +01:00
Phil Hughes 7ee5de1980 Consistent border radius 2016-04-26 09:03:04 +01:00
Phil Hughes b3af3930c6 Started updating search UI 2016-04-26 09:03:04 +01:00
Jacob Schatz 3d115d6748 Merge branch 'diff-line-colors' into 'master' 
Update diff blue & yellow to match design

<img src="/uploads/60e1351fb04ab1c8969685fbc8b61c88/Screen_Shot_2016-04-22_at_9.12.17_AM.png" width="500px">
<img src="/uploads/6812b22ec53f3041811261daa0584822/Screen_Shot_2016-04-22_at_9.12.05_AM.png" width="500px">

See merge request !3883
 2016-04-25 19:30:15 +00:00
Jacob Schatz 99c4513eaa Merge branch 'word-break' into 'master' 
Don't break line in middle of word

<img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px">

See merge request !3864
 2016-04-25 18:42:14 +00:00
Phil Hughes 172947f366 Updated select box to match design 2016-04-25 14:55:03 +01:00
Phil Hughes 5542c9456c Updated project group sharing UI 
Closes #13991
 2016-04-25 14:42:17 +01:00
Jacob Schatz be85fde663 Merge branch 'scss-empty-rule' into 'master' 
Enable the EmptyRule SCSS Linter

Prevents empty SCSS rules from being included in the SCSS.

Also fixes the handful of lints caught by the linter.

Regarding the `.gh` rule in monokai.scss, which was added in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/bf079c24afb8ad2991a4eaf60a71a7bc45dd775d), it appears to be empty in [the original file as well](https://github.com/richleland/pygments-css/blob/master/monokai.css). So I think it's fine to delete the selector.

cc: @jschatz1 

See merge request !3769
 2016-04-25 11:30:50 +00:00
Luke Howell 2dd4f796b1 Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. 2016-04-24 14:14:29 -05:00
Annabel Dunstone b014ec2b83 Update diff blue & yellow to match design 2016-04-22 09:53:45 -05:00
Phil HughesandRobert Speicher 50ed43e490 Improved confirmation UX 
Closes #4228
 2016-04-21 20:20:09 -04:00
Annabel Dunstone 328db9de27 Don't break line in middle of word 2016-04-21 15:32:38 -05:00
Annabel Dunstone 8277bd7968 Remove float from icon 2016-04-21 15:00:03 -05:00
Jacob Schatz 6a27a80867 Merge branch 'label-dropdown-fix' into 'master' 
Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670
 2016-04-21 17:32:24 +00:00
Annabel Dunstone 1641e81971 File name change appears on one line 2016-04-21 09:14:54 -05:00
Alfredo Sumaran 7e0ef892f4 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 2016-04-20 17:10:10 -05:00
Jacob Schatz 07c5df51eb Merge branch 'revert-diff-scroll' into 'master' 
Wrap all code in diffs

Closes #15382  
Closes #15422  
All diff code wraps to next line instead of scrolling

<img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px">

See merge request !3838
 2016-04-20 21:12:38 +00:00
Phil HughesandRobert Speicher 5c8959bbc1 Added variables 2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 720da4196c Updated based on designs 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher f56c626315 Fixed issue with bootstrap dropdown closing the calendar 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher aa22106b30 Posts the due date through AJAX 2016-04-20 15:42:09 -04:00
Annabel Dunstone 25f592cf9c Wrap all code in diffs 2016-04-20 11:48:24 -05:00
Alfredo Sumaran 7b6fe0e259 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
 2016-04-20 11:40:55 -05:00
Jacob Schatz bd65a2f6b2 Merge branch 'mobile-header-overlap' into 'master' 
Fixed overlap in header on mobile

![Screen_Shot_2016-04-18_at_08.48.29](/uploads/8f371d0c717a57ca7afb29415e13d96c/Screen_Shot_2016-04-18_at_08.48.29.png)

See merge request !3777
 2016-04-18 18:44:15 +00:00