Commit Graph
7376 Commits
Author SHA1 Message Date
Kamil Trzcinski baef6728fa Send trace to a browser incrementally when build is running
We send a state of ansi2html to client, client needs to send this state back.
The state describes the configuration of generator and position within trace.
2016-05-09 19:59:45 +03:00
Dmitriy Zaporozhets dd03cfd136 Make group settings button white instead of gray for better visibility
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-06 21:05:57 +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 510b10583c Add nice new Todo bell 2016-05-06 11:47:43 -04:00
Dmitriy Zaporozhets 64ef2e0834 Move group settings navigation to own partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-06 17:33:32 +02: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
Dmitriy Zaporozhets 5a8b8ba6c7 Fix group settings dropdown for group members and visitors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-05 16:37:41 +02:00
Dmitriy Zaporozhets 4bef939e27 Remove group rss icon since it depends on context and duplciates on other pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-05 16:31:19 +02: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
Annabel Dunstone 8d19955c05 Revert counter parentheses back to badges 2016-05-04 17:07:47 -05:00
Robert Speicher 915a4193b4 Merge branch 'sanitize-new-project-error-message' into 'master'
Sanitize repo paths in new project error message

Closes #17243

See merge request !4029
2016-05-04 22:03:18 +00: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
Stan Hu 75523d1df9 Sanitize repo paths in new project error message
Closes #17243
2016-05-04 14:06:07 -07: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
Jacob Schatz 8be1118aa5 Merge branch 'clean-user-profile-classes' into 'master'
Remove unused .contributed-projects class

While working on #13401 and trying to add a new tab to the user profile
page, I came across this. I noticed that the `contributed-projects`
class was only being used in order to select the div in the tests. For
consistency with the other tabs, I decided to remove this class and use
the div's id for the selector.

See merge request !3945
2016-05-04 18:34:34 +00: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
Artem Sidorenko fb5682e7cd Use the new admin settings for gravatar 2016-05-04 17:45:29 +02:00
Rémy Coutable b9d9a4d213 Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master'
Remove unnecessary method call in events view

Since `User#to_param` already returns `User#username`, we don't need to
pass in the user's username. Changing this also helps us obey LoD.

See merge request !3996
2016-05-04 14:12:51 +00:00
Douwe Maan 622ad2355a Merge branch 'rs-unique-signup-fields' into 'master'
Improve uniqueness of field names on the signup form

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075

See merge request !3826
2016-05-04 13:33:15 +00:00
Annabel Dunstone 21ccf89685 Redesign profile page and group page mobile navigation 2016-05-03 15:29:11 -05:00
connorshea b898810c8d Improve the Two-factor Authentication sign-in text [ci skip]
Resolves #14543.
2016-05-03 13:55:19 -06:00
Annabel Dunstone f53557a4fa Group navigation design update 2016-05-03 12:36:04 -05:00
Dmitriy Zaporozhets bdda1eedde Fix 404 on group page if user is not member of page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 14:30:42 +02: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 774af93027 Remove go to dashboard test suite for group page and get rid of AR warning
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 13:04:47 +02:00
Dmitriy Zaporozhets d8440b3035 Fix active state for group pages if user not logged in
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 12:37:07 +02:00
Dmitriy Zaporozhets 01aed0c848 Dont specify sidebar for group and group settings layouts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 12:31:50 +02:00
Dmitriy Zaporozhets df5b73e17d Merge branch 'master' into group-navigation-redesign 2016-05-03 10:45:45 +02:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Stan Hu f64b82e1da Support e-mail notifications for comments on project snippets
Closes #2334
2016-05-02 11:01:32 -07:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook
Codestyle changes to easy EE merge
2016-05-02 10:32:01 -03:00
Karlo Soriano 41df76b028 Remove unnecessary method call in events view
Since `User#to_param` already returns `User#username`, we don't need to
pass in the user's username. Changing this also helps us obey LoD.
2016-05-01 14:43:52 +08: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 535896cd1c Merge branch 'notification-email-badge-alignment' into 'master'
Updated spacing between notification label and button

![Screen_Shot_2016-04-28_at_11.36.26](/uploads/7b33e78e85688d96f878272ee93038ba/Screen_Shot_2016-04-28_at_11.36.26.png)

Closes #16552

See merge request !3965
2016-04-29 16:54:19 +00: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
Rémy Coutable bfc6a0e371 Merge branch 'gitattributes' into 'master'
Support supressing text file diffs on the default branch with .gitattributes

This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch.

When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed.

![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png)

I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`.

Fixes and closes gitlab-org/gitlab-ce#2315.

See merge request !3806
2016-04-29 12:40:13 +00:00
Matt Oakes 28dcdb2779 Support supressing text file diffs on the default branch with .gitattributes
This is a combination of 3 commits.

- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG
2016-04-29 12:45:15 +01:00
Arinde Eniola ded3b02f33 Use a better message when milestone is newly created
make some changes for the checks to determine when the messages should be displayed

add item to changelog and also integration test

make some changes to the test

make some changes
2016-04-29 10:15:49 +01:00
Robert Speicher 10f84f99cb Merge branch 'zj-large-files-no-highlight' into 'master'
Properly handle bigger files

Closes #3967

See merge request !3718
2016-04-28 21:33:50 +00: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
Zeger-Jan van de Weg ad99404d25 Properly handle bigger files 2016-04-28 21:28:39 +02:00