home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,370 Commits 48 Branches 340 Tags
f3d4f2eac7bcf787a00a6cff694fbfa8969830f4
Commit Graph
376 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns 
Closes #12796
 2016-01-28 09:06:20 +00: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
Jose Torres 26e31f5820 Substituted deprecated forum link with project issues link. [ci skip] 2016-01-25 13:10:11 -06:00
Douwe Maan 40d2daed89 Highlight note code and edit preview 2016-01-25 11:42:47 +01: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 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
Douwe Maan 21facf5353 Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets 2016-01-21 14:23:53 +01:00
Douwe Maan c23ca0b0b5 Merge branch 'master' into issue_3945 2016-01-20 14:53:41 +01:00
Rubén Dávila a091483b7a Some fixes from last code review. 2016-01-20 00:17:21 -05:00
Rubén Dávila b6170d2d8b Show last commit as description. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 3b75d65bd3 Show forks counter on listing. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 2b05bf4be5 Use Project creator's avatar in fork listing. #2406 2016-01-20 00:14:58 -05:00
Douwe Maan 512bebe21d Refactor Gitlab::Highlight and fix tests 2016-01-19 14:52:41 +01:00
Jacob Schatz fbb27a4244 Fix spacing issues, fix naming inconsistencies. Fix conflicts. 
Used `issuable` instead
 2016-01-18 20:17:29 -05:00
Jacob Schatz 3c078cef41 adds exclamation point when assigned user cannot merge 2016-01-18 20:12:06 -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 ef3d5a2712 Replace strong by span for .item-title elements 2016-01-15 15:46:01 +01: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 14695798fb Merge branch 'rs-fix-cross-reference' into 'master' 
Fix cross-project reference clipboard text

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2339

See merge request !2420
 2016-01-14 18:07:57 +00:00
Dmitriy Zaporozhets f8707e26ad Fix css mess around git clone panel. Align it properly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 17:42:15 +01: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
Rémy Coutable 818607f011 Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages 2016-01-14 09:41:11 +01:00
Robert Speicher 481431b75d Fix cross-project reference clipboard text 
See https://gitlab.com/gitlab-org/gitlab-ce/issues/4183
 2016-01-13 21:21:57 -05: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 b3431a8ce8 adds hover titles to merge request and issue pages 2016-01-11 12:50:01 -05:00
Dmitriy Zaporozhets f41b535ced Merge branch 'fix-build-status-caching' into 'master' 
Fix caching issue where build status was not updating in project dashboard

The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable.

Closes #3268

See merge request !2353
 2016-01-11 12:10:33 +00:00
iqualisoni e304a76eb6 Issue #5817 wording of the web hooks updated on issue and merge events 2016-01-11 01:02:27 -02:00
Stan Hu d5c8f1fdde Fix caching issue where build status was not updating in project dashboard 
Closes #3268
 2016-01-08 16:08:10 -08:00
Jacob Schatz b284ba24c2 changes verb references to noun reference. 2016-01-08 13:08:57 -05:00
Jacob Schatz 60aedb46d9 adds reference to the bottom of sidebar 2016-01-07 15:18:07 -05: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 7df3c1e8ea Correct the logo ID names 
Her left, not ours!
 2016-01-04 14:54:56 -05:00
Stan Hu 2802d4992d Expire view caches when application settings change 
Closes #5728
 2016-01-03 11:20:14 -08:00
Robert Speicher c80f75ea1f Give the logo shapes meaningful IDs 2016-01-02 15:29:55 -05:00
Zeger-Jan van de WegandRobert Speicher 1be406d741 Swap Author and Assignee Selectors on issuable index view 
Closes #4039
 2015-12-30 18:21:53 -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
Jacob Schatz 7ba4482fcf fixes failing test by updating project clone instructions 2015-12-23 19:57:30 -05:00
Jacob Schatz 8bbcbe7854 spacing changed from 4 to 2 in _clone_panel.html.haml. 2015-12-23 12:43:27 -05:00
Jacob SchatzandJacob Schatz ea5fa54b2d dropdown chooses right default 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz f56783e524 adds dropdown for cloning 2015-12-23 12:26:50 -05:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Dmitriy Zaporozhets 3321f694b8 Merge branch 'fix-milestone-snippet-header' into 'master' 
Fix headers of milestone and snippet show pages

Fix layout, and move "Edit" button to very right just like issue/MR.

Before:

![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png)

![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png)

After:

![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png)

![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2104
 2015-12-16 17:59:28 +00:00
Douwe Maan ff16ee63e6 Revert "Fix "Notifications" label color" 
This reverts commit e4e1777aa5.
 2015-12-16 16:23:31 +01:00
Douwe Maan f4c94e1fd6 Revert "Use regularly colored button for "Subscribe"/"Unsubscribe"" 
This reverts commit c1db8d1590.
 2015-12-16 16:23:18 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Douwe Maan c1db8d1590 Use regularly colored button for "Subscribe"/"Unsubscribe" 2015-12-15 17:33:03 +01:00
Douwe Maan e4e1777aa5 Fix "Notifications" label color 2015-12-15 17:32:46 +01:00