home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
2235 Commits
Author SHA1 Message Date
Douwe Maan 07c39c9976 Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' 
Add graphs of commits ahead/behind default branch (by @brunsa2)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716

See merge request !2301
 2016-01-05 15:44:22 +00:00
Dmitriy Zaporozhets a31d2f2a71 Merge branch 'new-markdown' into 'master' 
markdown fixes

old
![Screenshot_2016-01-05_10.49.46](/uploads/731f0e83ceefa74650ea27f8dca67b35/Screenshot_2016-01-05_10.49.46.png)

new
![Screenshot_2016-01-05_10.51.51](/uploads/85a82b2a589f9a4ad3dd47c6de3b89d7/Screenshot_2016-01-05_10.51.51.png)


See merge request !2295
 2016-01-05 11:48:29 +00:00
Andriy Dyadyura 00e8532d89 markdown fixes 2016-01-05 10:51:59 +01:00
Andriy Dyadyura f7ba38c073 markdown fixes 2016-01-05 10:45:18 +01:00
Dmitriy Zaporozhets e6713cd945 Merge branch 'improved-leave-project' into 'master' 
Adds settings menu to the top for editting and leaving projects

@creamzy @skyruler @dzaporozhets 
Menu contents depends on user's rights.

Fixes #4221


![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png)
![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png)
![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png)
![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png)


See merge request !2195
 2016-01-05 09:34:13 +00:00
Dmitriy Zaporozhets 525f8fb4fb Merge branch 'rs-logo-animation' into 'master' 
Use the logo as a loading indicator

![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif)

See merge request !2277
 2016-01-05 09:30:09 +00:00
Robert Speicher e5800d65de Use the logo as a loading indicator 
Closes #5616
 2016-01-02 15:43:02 -05:00
Robert Speicher d1873f16b4 Update cal-heatmap style overrides 
Some were no longer needed, others needed `!important`.
 2016-01-01 22:12:50 -05:00
Jacob Schatz eb162c2b27 adds settings menu to the top for editting and leaving projects 2015-12-28 14:45:23 -05:00
Dmitriy Zaporozhets aa712e2b36 Merge branch 'new-project-header-redesign' into 'master' 
Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now

Fixes #2876 and #3482
Used existing styles. <br/>
Did not attempt to make pixel perfect as styles already exist. <br/>

![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png)

See merge request !2156
 2015-12-24 14:17:11 +00:00
Valery Sizov 44cf1cbaaf Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 14:57:07 +02:00
Valery Sizov 6d07054747 fix specs 2015-12-24 14:54:02 +02:00
Andriy Dyadyura 5939d24756 nav full width 2015-12-24 12:22:01 +01:00
Valery Sizov d4e9c75844 Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 12:01:22 +02:00
Valery Sizov 5da8c1f77a fixes after review 2015-12-24 11:57:46 +02:00
Jacob Schatz a1294e5aab fixes css spacing issues 2015-12-23 20:39:42 -05:00
Jacob Schatz 77daadc92c Merge branch 'master' into new-project-header-redesign 2015-12-23 18:59:06 -05:00
Jacob SchatzandJacob Schatz f56783e524 adds dropdown for cloning 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz 011a7a3297 adds starring and unstarring text to star button, also adds partial new styles 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz 7b50ab5c1d arrows for buttons 2015-12-23 12:26:50 -05:00
Dmitriy Zaporozhets 9f69a0b229 Merge branch 'new-project-button-seperate-from-filter-name' into 'master' 
New project button with filter in header.

Fixes #3943 
![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/f7f952440b4bb4b55f62241bbc328c95/Screen_Shot_2015-12-21_at_3.47.01_PM.png)


See merge request !2165
 2015-12-23 16:51:03 +00:00
Dmitriy Zaporozhets 188c13b733 Merge branch 'button-height' into 'master' 
Button height

old
![Screenshot_2015-12-23_15.48.12](/uploads/0e6c5696262475c197f8fcbf00199132/Screenshot_2015-12-23_15.48.12.png)

new
![Screenshot_2015-12-23_15.48.45](/uploads/1d6bdf96f7c90b65f4a6b21df3951370/Screenshot_2015-12-23_15.48.45.png)

also including MR page

See merge request !2188
 2015-12-23 16:14:18 +00:00
Jacob Schatz 327c968037 fixes spacing between new project button and input 2015-12-23 10:48:42 -05:00
Jacob Schatz 8831f5dcb5 moves border bottom to left-menu-top class. 2015-12-23 10:41:29 -05:00
Andriy Dyadyura cee776c143 new button sizes 2015-12-23 16:25:42 +01:00
Dmitriy Zaporozhets 4e29045410 Merge branch 'double-border-on-no-comments' into 'master' 
border bottom for last comment fixes double line issue

Since image uploading isn't working atm. Will upload screenshots when it works again. 
https://unsee.cc/mosapine/
Fixes #3955 

See merge request !2175
 2015-12-23 15:22:54 +00:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Jacob Schatz 3686b45560 fixing conflict. 2015-12-23 09:10:16 -05:00
Dmitriy Zaporozhets 16a79f56b8 Merge branch 'new-buttons' into 'master' 
New buttons

OLD
![Screenshot_2015-12-22_21.42.59](/uploads/79e85727586f7b917b8ab9ef867e79dc/Screenshot_2015-12-22_21.42.59.png)

NEW
![Screenshot_2015-12-22_21.42.21](/uploads/aee54160f17e0502e14ca5c754dcfe50/Screenshot_2015-12-22_21.42.21.png)


See merge request !2179
 2015-12-23 14:07:10 +00:00
Jacob Schatz 265750c80d adds css for left-top-menu. Also hides buttons in certain for factors. 2015-12-23 09:00:59 -05:00
Jacob Schatz 48ecb614e7 project header 2015-12-23 08:25:03 -05:00
Dmitriy Zaporozhets c53742b14d Merge branch 'rs-update-jquery' into 'master' 
Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0

Closes #2859 

See merge request !2183
 2015-12-23 12:05:48 +00:00
Dmitriy Zaporozhets a84ecf0e2e Fix close/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-23 12:29:50 +01:00
Dmitriy Zaporozhets 7a519bc1e2 Merge branch 'master' into new-buttons 2015-12-23 12:16:37 +01:00
Valery Sizov efe98067da emoji picker search 2015-12-23 13:08:47 +02:00
Robert Speicher 5ad192ced2 Fix paths for jquery-ui assets 2015-12-22 17:14:01 -05:00
Andriy Dyadyura f30f518f97 buttons colors update 2015-12-22 22:33:46 +01:00
Valery Sizov 44d8714f38 improved emoji picker style 2015-12-22 23:27:05 +02:00
Valery SizovandValery Sizov dfd76c33d9 emoji css refactoring 2015-12-22 23:12:23 +02:00
Valery Sizov a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Andriy Dyadyura f4dabf9795 new buttons issue 2015-12-22 21:37:11 +01:00
Andriy Dyadyura a793590d43 new buttons 2015-12-22 21:22:37 +01:00
Jacob Schatz d0fc2fe288 border bottom for last comment fixes double line issue 2015-12-22 11:11:02 -05:00
Dmitriy Zaporozhets 52bca6da22 New color for cover block background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-22 11:22:14 +01:00
Jacob Schatz 62aac539b9 project header 2015-12-21 15:47:29 -05:00
Andriy Dyadyura 6dc487620b new colors 2015-12-21 16:10:03 +01:00
Andriy Dyadyura 2e7bee26f0 new-colors 2015-12-18 15:25:12 +01:00
Dmitriy Zaporozhets 4b7c9c7fe2 Revert sidebar position for issue and merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-17 10:34:15 +01:00
Dmitriy Zaporozhets 3162a5a293 Fix ux issue with "This issue will be closed automatically" message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-17 00:04:29 +01:00
Dmitriy Zaporozhets 664384e78b Merge remote-tracking branch 'origin/rs-simplify-status-icon' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-16 19:19:07 +01:00