728 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 53697439cc Make subnavigation a bit darker color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-09 11:42:48 +03:00
Robert Speicher 0de617772d Revert "Revert "Merge branch 'issue_3946' into 'master' ""
This reverts commit bf2a86b73c.
2016-07-07 23:48:02 -04:00
Robert Speicher bf2a86b73c Revert "Merge branch 'issue_3946' into 'master' "
This reverts commit 68155ee73b, reversing
changes made to 7ebd011ed1.
2016-07-07 18:25:05 -04:00
Jacob Schatz 5541e55c49 Merge branch 'issues-blank-state' into 'master'
Added blank state to issues

## What does this MR do?

Adds new blank state to issues when no issues exist.

Part of #18519 

## Screenshots (if relevant)

![Screen_Shot_2016-06-24_at_16.37.12](/uploads/0c3f385615b29216ef1137bd6fac06af/Screen_Shot_2016-06-24_at_16.37.12.png)

See merge request !4908
2016-07-07 21:17:23 +00:00
Douwe Maan 86d238e4bd Merge branch 'new-diff-notes' into 'master'
New diff notes

Fixes #12732, #14731, #19375, #14783 

Builds on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4110

To do:
- [x] Get it mostly working
- [x] Validate position validity
- [x] Fix: Don’t link to `#`
- [x] Fix: Base ref can be `nil`, potentially, when the MR has an oprhan source branch => Yep, doesn’t work. We need to store a `start_id`
- [x] Optimize: Fewer duplicate `git diff` compares
- [x] Optimize: Pass paths to `PositionTracer#diff` for faster diffs
- [x] Refactor: Use `head_id` in `MergeRequest`/`MergeRequestDiff` instead of `source_sha`
- [x] Refactor: Convert existing array-based diff refs to the DiffRefs model
- [x] Tweak: Use `note_type` in `Autosave` key
- [x] Tweak: Remove `line_code: note.line_code` from `link_to_reply_discussion`
- [x] Update: `SentNotifications` and reply-by-email receiver
- [x] Update: MR diff notification email
- [x] Update: API (MR, Commit note creation and entity)
- [x] Update: GitHub importer
- [x] Address any other TODO comments
- [x] Fix: Suppress "edited 4 minutes ago"
- [x] Write tests
  - [x] `LineMapper`
  - [x] `PositionTracer`
  - [x] `Position`
  - [x] `DiffPositionUpdateService`
  - [x] `DiffNote`
  - [x] `MergeRequests::RefreshService` / `MergeRequest#update_diff_notes_positions`
- [x] Make sure commits with diff notes don't get cleaned up, since this would prevent the diff notes from being rendered (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5062)

Future improvements:
- Display unresolved comments on files outside the diff, if the comment was added when that file _was_ part of the diff
- Allow commenting on sections between hunks, when expanding the diff using `...`
  - (We'd need to generate line code based on Position if we have it, even if it falls outside bounds of diff)
- `diff_hunk` on diff note API entity
- Show diff hunk in notification email
- Resolved line notes would have a boolean, and be inactive through `notes.any? { !active? || resolved? }`
- Multi line notes would store a number of positions, and do the right thing (™) in grouping and then rendering if the first item is multiline? => true
- Image diff notes could store x,y,width,height instead of old_line,new_line for similar grouping. Does it need a reference to say if it's on old or new? These can't have line_codes, clearly. Rendering would be interesting.
- Show commit line comments in the MR diff
- Comment on specific selected words
- Comment on file header
- Unfold top of discussion diff note
- New diff notes API for commits and MRs

/cc @rspeicher

See merge request !4101
2016-07-07 20:45:03 +00:00
Alfredo Sumaran 338072cc4b Layout for Users Groups and Projects on admin area 2016-07-07 13:25:58 -05:00
Dmitriy Zaporozhets 197b9793db Improve UI for member row on project/group members pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-07 09:15:49 +03:00
Douwe Maan 375193455a Style diff and blob file headers the same way 2016-07-06 18:50:59 -04:00
Jacob Schatz df174fa2d1 Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into 'master'
Added 100% width to open dropdown menus on mobile

## What does this MR do?

Sets dropdown-menus to be 100% width on small screens.

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

Do we want this on all dropdown menus or only dropdown menus activated by full-width buttons?
/cc @dzaporozhets 

## Why was this MR needed?

Mobile UX.

## What are the relevant issue numbers?

Closes #18858.

## Screenshots (if relevant)

![Screen_Shot_2016-06-22_at_00.14.09](/uploads/bd61721896bfac8af951374c2547acd6/Screen_Shot_2016-06-22_at_00.14.09.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4844
2016-07-06 21:01:07 +00:00
Phil Hughes e486bbfd34 Fixed spelling
Used variable for icon color
2016-07-06 09:02:52 +01:00
Patricio Cano 2e96fcff12 Clone button should not be clickable when there is a disabled protocol 2016-07-05 16:54:22 -05:00
Patricio Cano 82652013f2 Fix CSS 2016-07-05 16:54:22 -05:00
Patricio Cano 512adc21fe Add setting that allows admins to choose which Git access protocols are enabled 2016-07-05 16:54:22 -05:00
Dmitriy Zaporozhets 7facedfb19 Fix profile test to click on header user profile link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-05 16:17:05 +03:00
Dmitriy Zaporozhets bca47688d4 Remove current user link to the profile from sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-05 16:17:05 +03:00
Phil Hughes 4ddcac8ca8 Added blank state to issues 2016-07-05 09:06:38 +01:00
Dmitriy Zaporozhets c6bfad2a67 Merge branch 'user-avatar-header' into 'master'
Added user avatar to header

## What does this MR do?

Adds  the users avatar to the header with a dropdown for profile & sign out.

## What are the relevant issue numbers?

Closes #18543 

## Screenshots (if relevant)

![Screen_Shot_2016-06-27_at_12.47.34](/uploads/852d0eb7075eefcf21f5cf5ff71a389a/Screen_Shot_2016-06-27_at_12.47.34.png)

![Screen_Shot_2016-06-27_at_12.47.36](/uploads/6cb29843d3a12bbf2d3ed2a7c9bde770/Screen_Shot_2016-06-27_at_12.47.36.png)

See merge request !4939
2016-07-04 18:51:12 +00:00
Rémy Coutable 8625bd3622 Improve the request / withdraw access button
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01 12:48:54 +02:00
Phil Hughes 805b9a8347 Updated breakpoint for sidebar pinning 2016-06-30 16:15:32 +01:00
Jacob Schatz dbac53aa26 Merge branch 'left-align-flash-messages' into 'master'
Align flash messages with left side of page content

## What does this MR do?

- align flash messages with left side of page content

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

- flash messages in general

## Why was this MR needed?

- flash messages didn't fit new design

## What are the relevant issue numbers?

closes  #18688

## Screenshots

# Before

![failed-login](/uploads/fb57d288fb7ae775cc0b8dbb0c7b6af2/failed-login.png)

---

![explore-blocked-account](/uploads/aa6d5ff74a4c9ed29ed361f2ffdf5c8e/explore-blocked-account.png)

---

![project-blocked-account](/uploads/4f36118f5438d661ea202b180bf9cb8d/project-blocked-account.png)

---

![issue-blocked-account](/uploads/68e87385ec30952797dc5c1f8f36216d/issue-blocked-account.png)

---

![inline-flash](/uploads/c0aba047f90d56001265e37ba9751e19/inline-flash.png)

---

# After

![failed-login](/uploads/d45d2d832a16af8e1854f1832e7b87a4/failed-login.png)

---

![blocked-account](/uploads/ddcd3d23569ded403700c01934df61df/blocked-account.png)

---

![project-blocked-account](/uploads/9e286c3b95f70cae1819930a09cc1307/project-blocked-account.png)

---

![issue-blocked-account](/uploads/4fde8e770eab0dae03b25e1402f171a1/issue-blocked-account.png)

---

The left padding will be fixed by  !4854

![inline-flash](/uploads/081b824b99d8ca65d67e9d15778a991d/inline-flash.png)

---

![flash-dismissed](/uploads/641e6227050de22e0df9a85ffca4ced1/flash-dismissed.png)

See merge request !4959
2016-06-29 23:13:56 +00:00
Jacob Schatz 47648a50d7 Merge branch 'button-focus-style' into 'master'
Adds focus state style to markdown area buttons.

## What does this MR do?

It makes it possible to see when the button is focused when tabbing through the interface. This is for the new markdown buttons in the comment field.

See merge request !4867
2016-06-29 21:34:18 +00:00
Felipe Artur d2971315ab Merge branch 'master' into issue_3359_3 2016-06-29 11:32:38 -03:00
winniehell c8d66594e0 Align flash messages with left side of page content (!4959) 2016-06-29 16:22:41 +02:00
Felipe Artur 36d48120f6 merge master into issue_3359_3 2016-06-29 11:04:18 -03:00
Phil Hughes e65a703122 Updating padding in dropdown menu 2016-06-29 10:38:32 +01:00
Jacob Schatz 6ff039ac44 Merge branch 'lbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-page' into 'master'
Implement UI for new project page

## What does this MR do?

Updates the project creation page to conform with the latest UI updates.

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

Ney.

## Why was this MR needed?

Updated UI.

## What are the relevant issue numbers?

Closes #2542.

## Screenshots (if relevant)

**Desktop:**

![Screen_Shot_2016-06-18_at_04.00.48](/uploads/0313eee96a2aef9ed5e048989548b133/Screen_Shot_2016-06-18_at_04.00.48.png)

**Mobile:**

![Screen_Shot_2016-06-18_at_04.01.00](/uploads/505b110c3fcbf523aac08797db9f6781/Screen_Shot_2016-06-18_at_04.01.00.png)

See merge request !4766
2016-06-28 16:19:46 +00:00
Annabel DunstoneandDmitriy Zaporozhets 706c5a1399 Switched mobile button icons to ellipsis and angle 2016-06-28 16:01:42 +02:00
Annabel DunstoneandPhil Hughes 2e1a70fefc Decreased window min width for pinned sidebar 2016-06-28 13:41:46 +01:00
Luke "Jared" Bennett 957143347c Wiped old page and started on new UI
Completed new project page

Updated CHANGELOG

Corrected 'Create project' button

Made responsive

Added gitlab export button

Changed Spinach test to match updated UI

reverted test changes and fixed UI

Corrected 'Repo by URL' text

Fixed static namespace style

Added errors partial

Added padding to bottom of page-with-sidebar
2016-06-28 01:17:01 +01:00
Phil Hughes e7aa8315af Added user avatar to header
Closes #18543
2016-06-27 12:46:27 +01:00
Jacob Schatz 214137aa60 Merge branch 'fix-logo' into 'master'
Remove width restriction for logo on sign-in page.

Follow-up on !4661 since we didn't remove the width restriction on that.

See merge request !4888
2016-06-23 22:42:55 +00:00
Connor Shea efabe5a444 Remove width restriction for logo on sign-in page. 2016-06-23 15:58:10 -06:00
Annabel DunstoneandJacob Schatz 12aca07723 Fix positioning of Repository sub nav scrolling 2016-06-23 17:45:22 -04:00
Annabel DunstoneandJacob Schatz ee8b0d37fa Move fade divs out of every scrolling container; remove unneeded scrolling CSS 2016-06-23 17:45:22 -04:00
Annabel DunstoneandJacob Schatz 350e57fd0e Move fade out divs outside of scrolling container on project view 2016-06-23 17:45:22 -04:00
Jacob Schatz e393a8f0bb Fix header logo width/height issues 2016-06-23 00:50:50 -04:00
Connor Shea a604553890 Adds focus state style to markdown area buttons. 2016-06-22 16:02:44 -06:00
Connor Shea 2b1ee3f3d2 Restrict header logo to 36px so it doesn't overflow. 2016-06-22 13:50:37 -06:00
Jacob Schatz 36e645c31e Merge branch 'arrow-nav-bug' into 'master'
Hide nav arrows by default

## What does this MR do?
- Fixes the arrow icon flashing on page load
- Removes settings dropdown at higher breakpoint
- Removes unneeded CSS

Closes #18941

## Screenshots (if relevant)
Arrow flashing bug:    
![icon](/uploads/3db95626acd0adb37438bdbc2c4aa154/icon.gif)

Settings dropdown breaking nav:    
<img src="/uploads/4351035f4cf8cb9fd892b621e6339e50/Screen_Shot_2016-06-21_at_4.25.50_PM.png" width="800px">

@alfredo1 would you mind double checking this to make sure the arrow flashing is definitely not happening? 

See merge request !4843
2016-06-22 16:14:53 +00:00
Luke "Jared" Bennett acde2e30b6 Added 100% width to open dropdown menus on mobile 2016-06-22 00:17:44 +01:00
Annabel Dunstone 94ac45cf0e Hide nav arrows by default; remove settings dropdown btn at larger breakpoint; remove unneccessary CSS 2016-06-21 17:27:34 -05:00
Dmitriy Zaporozhets ff84cc0b81 Merge branch 'master' into 18533-graphs-wiki-subnav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-22 00:00:41 +03:00
Annabel Dunstone 795b8b3073 Update gray block under subnav to match other pages 2016-06-21 13:16:28 -05:00
Jacob Schatz e6e6989f32 Merge branch 'nav-count-alignment-ff' into 'master'
Fixed issue with navbar counts being misaligned

## What does this MR do?

Fixes an issue in FireFox with the number counts being mis-aligned.

## What are the relevant issue numbers?

Closes #18916 

## Screenshots (if relevant)

![Screen_Shot_2016-06-21_at_15.56.51](/uploads/1d07543c14215e9e15facacc96aa3564/Screen_Shot_2016-06-21_at_15.56.51.png)

See merge request !4829
2016-06-21 17:42:01 +00:00
Jacob Schatz cf879c9334 Merge branch 'date-picker-hover' into 'master'
Fixed hover of date picker calendar

## What does this MR do?

Fixes the hover styling of days on the datepicker dropdown in the issuable sidebar.

## Screenshots (if relevant)

![hover](/uploads/2514dc772187da33c54f8b6324202189/hover.gif)

See merge request !4786
2016-06-21 16:30:40 +00:00
Annabel DunstoneandJacob Schatz 1d7b809a01 Move new page link out of sub nav 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz 6f642fd423 Add new style for sub header block info 2016-06-21 12:15:49 -04:00
Dmitriy Zaporozhets 44fe4f63f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-06-21 18:48:05 +03:00
Dmitriy Zaporozhets dcf8304b6c Merge branch '18881-horizontal-nav-arrow' 2016-06-21 18:47:12 +03:00
Phil Hughes c89b0d9bf6 Fixed issue with navbar counts being misaligned
Closes #18916
2016-06-21 15:55:30 +01:00