Commit Graph
16271 Commits
Author SHA1 Message Date
Jacob Schatz 3f41eecff2 Merge branch '18857-new-label-page-needs-work-on-mobile' into 'master'
Added bottom padding to label color suggestion link

## What does this MR do?

Adds a bottom margin to label color suggestions to make sure that when wrapped there is enough whitespace between color rows.

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

😕 

## Why was this MR needed?

Mobile UX.

## What are the relevant issue numbers?

Closes #18857.

## Screenshots (if relevant)

![Screen_Shot_2016-06-22_at_00.31.26](/uploads/f49c7fa2b97b13e69f0dea97c5dfb319/Screen_Shot_2016-06-22_at_00.31.26.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 !4845
2016-06-23 05:07:04 +00:00
Jacob Schatz 62948886fb Merge branch 'fix-header-logo' into 'master'
Restrict header logo to 36px so it doesn't overflow.

## What does this MR do?

Fixes the logo in the header.

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

I don't think so.

## Why was this MR needed?

Logos that weren't 36px by 36px were broken in 8.9.0

## What are the relevant issue numbers?

Fixes #18980

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-22_at_1.52.54_PM](/uploads/de6e4d9ccf40b972565e3864173a9907/Screen_Shot_2016-06-22_at_1.52.54_PM.png)

After:

![Screen_Shot_2016-06-22_at_1.52.37_PM](/uploads/d72e015263888b5155c1db5e25f54d66/Screen_Shot_2016-06-22_at_1.52.37_PM.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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)

cc: @jschatz1 @dzaporozhets @rspeicher 

See merge request !4861
2016-06-23 04:52:22 +00:00
Jacob Schatz e393a8f0bb Fix header logo width/height issues 2016-06-23 00:50:50 -04:00
Connor Shea bba1d2de3b Add clarifying comment and a Changelog entry. 2016-06-22 16:25:59 -06:00
Connor Shea 97ec04ac9b Add Subresource Integrity attribute to CSS and JS assets.
This prevents compromised or malicious CDNs from modifying assets. The hash provided by Rails is compared to the hash of the asset the browser has downloaded. The browser will refuse to execute/parse the assets if the hashes don't match. SRI is currently implemented in Firefox, Chrome, and Opera.

More information is available in #18230 and on MDN: https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity

This doesn't apply to the dynamically-generated per-page JavaScript due to a bug in sprockets-rails (https://github.com/rails/sprockets-rails/issues/359).
2016-06-22 16:22:45 -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
Dmitriy Zaporozhets 93106e150d Merge branch '18855-wrap-code-in-activities-and-todos' into 'master'
Wrap code blocks on Activies and Todos page

## What does this MR do?

wrap code blocks on Activities and Todos page

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

Can `white-space: pre-wrap` be used for code blocks everywhere?

## Why was this MR needed?

Content of code blocks is cut on small screen sizes.

## What are the relevant issue numbers?

closes #18855

## Screenshots

![activities-code](/uploads/83eb5100dbcc34ade8892e9f68bf767f/activities-code.png)

![todos-code](/uploads/80efbf4875c9f5db1f1a3790fc8afa3b/todos-code.png)


See merge request !4783
2016-06-22 10:56:43 +00:00
Rémy Coutable df8dd6dea3 Merge branch 'fix/error-typo' into 'master'
fix import/export error typo

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18948

See merge request !4847
2016-06-22 08:37:55 +00:00
James Lopez 5adc085962 refactor to use haml instead 2016-06-22 08:48:18 +02:00
James Lopez d19379e00d fix typo 2016-06-22 07:39:08 +02:00
Douwe Maan 9676421d01 Merge branch 'fix-network-links' into 'master'
Fix Network graph links.

## What does this MR do?

Fixes the Network graph links so they no longer link to `/master#{escape_javascript(@commit_url)}`

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

Don't think so.

## Why was this MR needed?

Single quotes don't evaluate Ruby expressions.

## What are the relevant issue numbers?

Fixes #18894.

cc: @jschatz1 

See merge request !4832
2016-06-22 01:18:45 +00:00
Douwe Maan a3a8798a1b Merge branch 'fix-auto-mr-close' into 'master'
Fix auto-MR-close text from branch name

## What does this MR do?

Fix the MR-auto-close feature if a branch name begins with an issue IID.

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

It's one line, so check that line thoroughly 😃

## Why was this MR needed?

When I create a new MR from a branch starting with an issue IID, the description doesn't get suffixed with the 'Closes #blahblah' that it should do.

## What are the relevant issue numbers?

Don't think there are any.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added

See merge request !4836
2016-06-22 01:18:12 +00:00
Douwe Maan 4dcf107b26 Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master'
Display group/project access requesters separately in admin

## What does this MR do?

It displays the access requesters in a separate list in group & project members pages.

It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & non-admin members views).

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

No.

## Why was this MR needed?

To not confuse access requesters with actual members.

## What are the relevant issue numbers?

Closes #18871.

## Screenshots

### Group members

| Before | After |
| --------- | ---- |
| ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) |

### Project members

| Before | After |
| --------- | ---- |
| ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) |

### Admin group members

| Before | After |
| --------- | ---- |
| ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) |

### Admin project members

| Before | After |
| --------- | ---- |
| ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) |

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG since this is related to the original "request access" MR.
- [ ] 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 !4798
2016-06-22 01:17:08 +00:00
Douwe Maan c11006ac6c Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'
Resolve "Destroying a project causes post_decline_request to be executed"

## What does this MR do?

Ensure we don't send "access request declined" to access requesters when a project is deleted.

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

I've created a service to decouple the notification sending from the AR model.

## Why was this MR needed?

Because there was an issue.

## What are the relevant issue numbers?

Fixes #18755, #18750.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG needed.
- [x] Tests
  - [x] Added for this feature/bug
  - [x] 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 !4744
2016-06-22 01:15:29 +00:00
Luke "Jared" Bennett 611bc0090a Added bottom padding to label color suggestion link 2016-06-22 00:31:53 +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
Dmitriy Zaporozhets 76c6b9c8d8 Put wiki page history content into container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-21 23:54:00 +03:00
Dmitriy Zaporozhets 1551615030 Merge branch 'rename-code-to-repo' into 'master'
Rename Code tab to Repository

As discussed in #18830, this renames the "Code" tab to "Repository".

Screenshot now:

![image](/uploads/a7807dfb5b42f037fe2a44475a4af883/image.png)


See merge request !4807
2016-06-21 20:46:01 +00:00
Jacob Schatz 7198b78417 Merge branch 'contributors-graph-mobile' into 'master'
Apply responsive design for Contributors graphs.

## What does this MR do?

Makes the Contributors graphs work on mobile.

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

That this doesn't break on any screen sizes.

## Why was this MR needed?

It used to be squished and impossible to read.

## What are the relevant issue numbers?

Fixes #18845.

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-18_at_1.00.58_PM](/uploads/bc17df5dabed0085c8ffdca303a502a5/Screen_Shot_2016-06-18_at_1.00.58_PM.png)

After:

![Screen_Shot_2016-06-20_at_9.21.03_AM](/uploads/a0307cb255646800d0e4c8647769f7b6/Screen_Shot_2016-06-20_at_9.21.03_AM.png)

cc: @jschatz1 

See merge request !4801
2016-06-21 20:29:50 +00:00
Jacob Schatz 0f902d51a6 Merge branch '18934-compare-gray-block' into 'master'
Update gray block under subnav to match other pages

## What does this MR do?
Makes Compare sub nav full width; replaces gray block with white one to match rest of pages

## What are the relevant issue numbers?
Closes #18934 

## Screenshots (if relevant)
![Screen_Shot_2016-06-21_at_1.14.46_PM](/uploads/43377efe7816b854f48966bcbd96a1cc/Screen_Shot_2016-06-21_at_1.14.46_PM.png)

cc @dzaporozhets 

See merge request !4838
2016-06-21 19:34:13 +00:00
Robert Speicher 63d411d755 Merge branch '17671-private-forks-list-ui-issues' into 'master'
Fixed private forks notice position in forks list

Moves the private forks notification item into the list on the forks page.

Closes #17671.

See merge request !4573
2016-06-21 18:45:14 +00:00
Connor Shea 91a112cba4 Remove unnecessary string interpolation. 2016-06-21 12:35:55 -06:00
Connor Shea 07b3bf9ec3 Fix Network graph links.
Resolves #18894.
2016-06-21 12:25:18 -06:00
Robert Speicher ae63172dd2 Merge branch 'remove-banzai-pre-process' into 'master'
Move pre_process into render_result

This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`.

The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details.

See merge request !4830
2016-06-21 18:23:51 +00:00
Annabel Dunstone 795b8b3073 Update gray block under subnav to match other pages 2016-06-21 13:16:28 -05:00
Jacob Schatz 4523da8fbf Merge branch 'selector-refactor' into 'master'
jQuery selector refactor in application.js.

Minor refactor for unnecessarily repeated `$(document)` `$(window)` and `$('body')`

See merge request !4809
2016-06-21 17:48:09 +00: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
Sean McGivern b2f60bb9a1 Fix auto-MR-close text from branch name
Rails's form helpers use the `$attr_before_type_cast` method where
available, and this value only appears to be updated on assignment, not
when the object is mutated in some other way:

    [1] pry(main)> mr = MergeRequest.new
    => #<MergeRequest:0x007fcf28395d88 ...>
    [2] pry(main)> mr.description = 'foo'
    => "foo"
    [3] pry(main)> mr.description << ' bar'
    => "foo bar"
    [4] pry(main)> mr.description
    => "foo bar"
    [5] pry(main)> mr.description_before_type_cast
    => "foo"
    [6] pry(main)> mr.description += ' bar'
    => "foo bar bar"
    [7] pry(main)> mr.description_before_type_cast
    => "foo bar bar"
2016-06-21 17:59:20 +01:00
Jacob Schatz 707e8d434d Merge branch 'fix-button-title' into 'master'
Capitalize button text

Capitalizes button text to match the rest.

See merge request !4834
2016-06-21 16:44:56 +00:00
Jacob Schatz c70c3bad8a Merge branch 'dz-fix-appearance-preview' into 'master'
Fix admin appearance settings preview

Render appearance settings preview in devise layout instead of implementing it 2 times. 

See merge request !4792
2016-06-21 16:31:33 +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
Jacob Schatz 3cfd2374e0 Merge branch '18854-prio-labels-on-mobile' into 'master'
Fixes labels view on mobile

## What does this MR do?
Fixes priority labels view on mobile

## What are the relevant issue numbers?
Fixes #18854

## Screenshots (if relevant)

<img src="/uploads/f75be3a2788858f12a63820559f20886/Screen_Shot_2016-06-20_at_2.23.26_PM.png" width="487">


See merge request !4806
2016-06-21 16:28:54 +00:00
Annabel DunstoneandJacob Schatz 25ae737df0 Add new page button to wiki home 2016-06-21 12:15:49 -04: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
Annabel DunstoneandJacob Schatz a02c3d09d3 Fix graph columns 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz a4c9b4fbe9 Style wiki sub nav links 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz 8e84153044 Style sub nav links in Graphs 2016-06-21 12:15:49 -04:00
Alfredo Sumaran c2d6981db4 Capitalize button text 2016-06-21 11:02:53 -05:00
Dmitriy Zaporozhets 5ecae728e3 Merge branch 'li-fade'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4799
2016-06-21 19:01:37 +03:00
Dmitriy Zaporozhets df689bdf69 Merge branch '18787-user-img-compare' into 'master'
Align avatar and commit content within commit row

## What does this MR do?
Aligns the user avatar on `Compare`

## What are the relevant issue numbers?
Closes #18787 

## Screenshots (if relevant)
<img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px">
<img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px">


See merge request !4764
2016-06-21 15:54:43 +00: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
Yorick Peterse d9a4ca5975 Move pre_process into render_result
The method Banzai::Renderer.pre_process would always be called,
regardless of whether the Markdown to render was already cached or not.
In cache the document _was_ cached the output of the pre-processing
pipeline was ignored resulting in it doing nothing but wasting CPU
cycles.

This commit moves Banzai::Renderer.pre_process into
Banzai::Renderer.render_result so that it's _only_ used when needed.
2016-06-21 17:39:01 +02:00
Jacob Schatz 179783f1ce Merge branch 'notification-dropdown-active-fix' into 'master'
Fixed issue with notification dropdown not updating active

## What does this MR do?

This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success.

## What are the relevant issue numbers?

Closes #18480 

## Screenshots (if relevant)

![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif)

See merge request !4615
2016-06-21 15:31:39 +00:00
Yorick Peterse 15a87f3129 Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master'
Optimize Banzai::Filter::RelativeLinkFilter

See merge request !4813
2016-06-21 15:28:59 +00:00
Jacob Schatz 3a74ab2918 Merge branch 'blank-state' into 'master'
Updated blank state for environments and deployments

## What does this MR do?

Adds a designed blank state to environments and deployments.

@markpundsack do we want to hide the new environments when empty? Looks weird otherwise with the green button at the top.

## What are the relevant issue numbers?

Closes #18661 

## Screenshots (if relevant)

![Screen_Shot_2016-06-21_at_09.55.03](/uploads/cf768aba3fd85a596d24b7be4fe6a6c0/Screen_Shot_2016-06-21_at_09.55.03.png)

![Screen_Shot_2016-06-21_at_09.55.10](/uploads/b7b7dba90b613cfa867b084661b36b06/Screen_Shot_2016-06-21_at_09.55.10.png)

See merge request !4818
2016-06-21 15:27:58 +00:00
Jacob Schatz ac4529f700 Merge branch '18743-sidebar-pin-tooltip' into 'master'
Resolve "Tooltip for pinning sidebar"

## What does this MR do?
Adds tooltip to show whether sidebar is pinned/unpinned

## What are the relevant issue numbers?
Closes #18743 

## Screenshots (if relevant)
![Screen_Shot_2016-06-17_at_12.14.25_PM](/uploads/162f52084a770012cdc621122acd6c6c/Screen_Shot_2016-06-17_at_12.14.25_PM.png)
![Screen_Shot_2016-06-17_at_12.14.35_PM](/uploads/d9296720aeada972441f48d9a3d2f7f8/Screen_Shot_2016-06-17_at_12.14.35_PM.png)

See merge request !4759
2016-06-21 14:56:21 +00:00