Commit Graph
4440 Commits
Author SHA1 Message Date
Benedikt Huss ed2a7a1ec6 Fix build notification on merge request page change even if the build status didn't change 2016-05-08 21:41:09 +02:00
Dmitriy Zaporozhets ecd7c1d25a Merge branch 'nice-todos-bell' into 'master'
Add nice new Todo bell

![H5bp___Html5_Boilerplate___GitLab](/uploads/e8725396a5d77a8db09742f977595605/H5bp___Html5_Boilerplate___GitLab.png)

![H5bp___Html5_Boilerplate___GitLab](/uploads/011a21ee1653502c4f78543e28d97b67/H5bp___Html5_Boilerplate___GitLab.png)

![H5bp___Html5_Boilerplate___GitLab](/uploads/0858cb9621463ef6a32237fcb0b4f63d/H5bp___Html5_Boilerplate___GitLab.png)

Fixes: #15671 

See merge request !4077
2016-05-06 16:37:40 +00:00
Jacob Schatz 50b89cd9bf Merge branch '17343-a-tag-code' into 'master'
Align code within links in comments

Closes #17343

<img src="/uploads/78e03c1dc0e99c7bdb686d9d120a4525/Screen_Shot_2016-05-06_at_9.28.26_AM.png" width="800px">

See merge request !4073
2016-05-06 16:08:45 +00:00
Jacob Schatz 510b10583c Add nice new Todo bell 2016-05-06 11:47:43 -04:00
Annabel Dunstone 0aba37cfd1 Align code within links in comments 2016-05-06 09:21:04 -05: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 00b3eedf7c Remove duplicate cover-control mobile styles 2016-05-05 12:55:01 -05:00
Annabel Dunstone c24958365f Remove mobile styles; horizontally scroll layout nav links 2016-05-05 09:00:29 -05:00
Jacob Schatz 0bdb68ef60 Merge branch '15179-builds-redesign' into 'master'
15179 builds page redesign

Closes #15179   

<img src="/uploads/d9ec515e500dc9023d588b5c38636a86/Screen_Shot_2016-04-26_at_1.35.11_PM.png" width="800px">

Updated screenshot:   
<img src="/uploads/63109057ee271d788ab726e52acf9328/Screen_Shot_2016-05-04_at_9.23.01_AM.png" width="800px">

Updated screenshot with count badges instead of parentheses:  
<img src="/uploads/d9cd91b079d23c63601c8dbcf4803c8d/Screen_Shot_2016-05-05_at_7.40.48_AM.png" width="800px">

See merge request !3935
2016-05-05 13:39:28 +00:00
Dmitriy Zaporozhets 3592a59715 Merge branch 'master' into group-navigation-redesign 2016-05-05 11:44:03 +02:00
Benedikt Huss 0e9c2e721b Feedback from stanhu 2016-05-05 00:18:36 +02:00
Benedikt Huss 655b2640ae Merge request widget displays TeamCity build state and code coverage correctly again 2016-05-05 00:07:56 +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
Jacob Schatz 950ab1e847 Merge branch '17000-comment-links' into 'master'
Remove break-all from links

Closes #17000

See merge request !4042
2016-05-04 20:59:27 +00:00
Jacob Schatz 7ed3a6944f Merge branch 'fix-files-page-colors' into 'master'
Fix file list page border colors



See merge request !4008
2016-05-04 20:57:38 +00:00
Jacob Schatz 2b4e8d933c Merge branch 'improve-milestone-ui' into 'master'
Improve milestone page UI

* remove button after edit button
* use hex value for text color
* re-use existing text color variables

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

See merge request !4014
2016-05-04 20:56:13 +00:00
Annabel Dunstone ccd9c4be00 Reduce height of nav to 50px 2016-05-04 15:50:30 -05:00
Annabel Dunstone 6b4e255aa8 Remove break-all from links 2016-05-04 15:00:33 -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 268868bcf0 Improve milestone page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 13:21:09 +02: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 e31b471efc Make files list more compact by reducing row height from 47px to 44px
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-02 19:22:48 +02:00
Jacob Schatz 85d6403278 Merge branch 'dz-small-ui-fixes' into 'master'
Move modal css to separate file and fix danger text for confirmation modal

* in help file I found css for modal that affect whole application -> moved to separate file
* fixed ugly confirmation message when remove project

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

See merge request !3979
2016-04-29 17:56:46 +00: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
Jacob Schatz ef842562d6 Merge branch 'duplicate-label-dropdown' into 'master'
Removes duplicates from the label dropdown

It concats the duplicate labels into a single label in the dropdown with the color being a gradient of the differnet colors being concatted.

I liked your idea @jschatz1 of using a standard icon color. However, with this i've taken all the duplicated colors & made a little gradient with them so it still half resembles the label colors (this has been limited to 4 or it could get crazy!)

![Screen_Shot_2016-04-28_at_10.35.04](/uploads/41f45f3f92f971e7f38df7a98765cb9d/Screen_Shot_2016-04-28_at_10.35.04.png)

Closes #16555, #14820

See merge request !3963
2016-04-29 17:01:33 +00:00
Phil HughesandJacob Schatz b2ec176539 Removes duplicates from the label dropdown
It concats the duplicate labels into a single label in the dropdown with
the color being a gradient of the differnet colors being concatted.

Closes #16555
2016-04-29 12:10:30 -04:00
Jacob Schatz 79c27e6a7b Merge branch 'emoji_award_coffee_refactoring' into 'master'
AwardsHandler follows code style conventions



See merge request !3871
2016-04-29 15:55:28 +00: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 9bccb4c951 Merge branch 'protected-branches-ui' into 'master'
Protected branches UI

![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png)

![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png)

Closes #14027

See merge request !3929
2016-04-28 20:17:41 +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
Jacob Schatz bdcba43873 Merge branch 'project-deploy-keys-ui' into 'master'
Project deploy keys updated UI

Closes #13992

See merge request !3912
2016-04-28 20:16:04 +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
Jacob Schatz a792427eed Merge branch 'add-js-prefix-to-user-tab-classes' into 'master'
Add JS prefix to user tab classes

## What does this MR do

This MR adds the `js-` prefix to the classes which are used for js purposes only. This MR only affects the said classes inside `users/show.html.haml`.

## Are there points in the code the reviewer needs to double check?

I'm not entirely sure if this project uses the `js-` prefix for
classes that are used for js purposes only. Doing a grep shows some of the classes have the prefix, but I'm still unsure whether this project follows this rule.

## Why was this MR needed?

As I was working thru #13401, I wanted to add a tab on the user profile page to show the contributions outside the GitLab instance. Reading the JS, I came across this. This MR helps new people reading the code that the said classes are for js purposes only. Also, it helps the project work toward to uniform class naming.

I suggest that we document adding the `js-` prefix to classes for js purposes only (if this is the case for this project)

See merge request !3928
2016-04-27 21:30:42 +00:00
Jacob Schatz 1b35955e0b Merge branch 'sidebar-label-link' into 'master'
Updated label links to work correctly for filtering

See !3846#note_5033951

See merge request !3920
2016-04-27 17:25:32 +00:00
Jacob Schatz 7640e60a50 Merge branch 'esc-close-dropdown' into 'master'
Escape key closes the dropdown

Fixes #15432 

![esc](/uploads/067e32bcaf265c3241d84dcbd3f11532/esc.gif)

See merge request !3904
2016-04-27 16:11:31 +00: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
Jacob Schatz dfe0ec8f72 Merge branch 'parallel-diff-alignment' into 'master'
Reduce width of parallel diffs

At 50% width the alignment is off on parallel diffs (see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3785/diffs and view in Side-by-Side)  
Reducing width lines them up:

<img src="/uploads/5775d35b0e86397abd10db6195a8a54d/Screen_Shot_2016-04-22_at_2.19.21_PM.png" width="400px">

Also shifted comment button over to center it properly:  
<img src="/uploads/c2468e15bb65523464a941001c3d7298/Screen_Shot_2016-04-22_at_2.24.33_PM.png" width="200px">

See merge request !3891
2016-04-26 19:01:24 +00:00