Commit Graph
30210 Commits
Author SHA1 Message Date
Jacob SchatzandRobert Speicher fb310400a6 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 14:38:13 -04:00
Rémy CoutableandRobert Speicher 735d5cbc7d Merge branch 'fix/import-export-gitlab-errors' into 'master'
Fix errors found on importing GitLab CE repo

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

See merge request !4855
2016-06-23 14:36:40 -04:00
Jacob SchatzandRobert Speicher 0d8437ec0b 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 14:34:43 -04:00
Jacob SchatzandRobert Speicher 060c4a506e 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-23 14:33:58 -04:00
Robert SpeicherandRobert Speicher 1c14b91ec1 Merge branch 'inline-todos-docs' into 'master'
Update Todos documentation and screenshots to include new functionality.

Updates documentation for todos, includes updated and new screenshots.

See also !4502 and #18906

Closes #18923

[ci skip]

See merge request !4840
2016-06-23 14:33:03 -04:00
Robert SpeicherandRobert Speicher b5607e47f1 Merge branch 'fix-external-issue-links' into 'master'
Handle external issues in IssueReferenceFilter

Handling of external issues was broken when I refactored
`IssueReferenceFilter` to use fewer SQL queries.

Fixes #18827

See merge request !4789
2016-06-23 14:30:38 -04:00
Stan HuandRobert Speicher d37fa9db9e Merge branch '18819-wiki-link-filter-exception' into 'master'
Fix bug in `WikiLinkFilter`.

Closes #18819

- [ ]  #18819 Wiki link filter exception
    - [x]  Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/6d169d36cabda783116bcb8e2e6f73254566a670/builds) passes
    - [ ]  Wait for merge
    - [ ]  Pick into 8.9

See merge request !4775
2016-06-23 14:29:44 -04:00
Robert SpeicherandRobert Speicher a767bb4690 Merge branch 'fix_saml_signin' into 'master'
Fix subsequent SAML sign ins

Fixes a bug when `auto_link_ldap_user` is `true` that causes SAML users to be unable to sign in a second time.

Fix the problem for https://gitlab.zendesk.com/agent/tickets/22546

See merge request !4718
2016-06-23 14:28:43 -04:00
Jacob SchatzandRobert Speicher 37e5ef1f4b Merge branch 'commit-header' into 'master'
Fixes header vertical centering.

Fixes header centering.

![ss__2016-05-16_at_5.26.30_PM](/uploads/300b64afc6585023f0e0dbbf721c359a/ss__2016-05-16_at_5.26.30_PM.png)

cc @dzaporozhets

See merge request !4170
2016-06-23 14:27:57 -04:00
Achilleas PipinellisandRémy Coutable 034810fa2e Merge branch 'award-emoji-docs' into 'master'
Expand on Award Emoji documentation, update/add screenshots.

Adds documentation for award emoji now that comments can be awarded with emojis.

See also !4291 and #18906

Closes #9091

cc: @virtuacreative @axil

See merge request !4839

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:57:36 +02:00
Douwe MaanandRémy Coutable ad1158837e 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

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:55:33 +02:00
Achilleas PipinellisandRémy Coutable 1e34a81cd4 Merge branch 'expiry' into 'master'
Clarify artifact expiry

## What does this MR do?

Clarifies documentation about artifact expiry.

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

## Why was this MR needed?

## What are the relevant issue numbers?

## Screenshots (if relevant)

See merge request !4831

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:54:31 +02:00
Marin JankovskiandRémy Coutable 85f324ca4f Merge branch 'custom-registry-storage-docs' into 'master'
Add documentation and examples for configuring cloud storage for registry images.

## What does this MR do?
Adds documentation and examples for configuring cloud storage for registry images.

Waits for backend config to get merged in:
https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/816

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1320
## Does this MR meet the acceptance criteria?

- [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [x] [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~~
  - [x] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc\ @marin

See merge request !4812

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:53:28 +02:00
Douwe MaanandRémy Coutable b791f98f2e 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

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:51:50 +02:00
Douwe MaanandRémy Coutable 9af7d71bd6 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

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:50:04 +02:00
Achilleas PipinellisandRémy Coutable 88ece3108b Merge branch 'hotfix/better-container-registry-documentation' into 'master'
Add some docs for Docker Registry configuration - Relatively important for anyone installing from source

There have been a few issues created because of the lack of documentation for how to configure Docker Registry when installing from source, specifically what the `realm` needs to be and the `service`

These 2 bits of info will stop a lot of headaches 👍

Issues:
https://gitlab.com/gitlab-org/gitlab-ce/issues/17957
https://gitlab.com/gitlab-org/gitlab-ce/issues/17991

See merge request !4738

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:47:49 +02:00
Achilleas PipinellisandRémy Coutable bca48a0a85 Merge branch 'feature/import-export-docs' into 'master'
import/export docs

Added documentation for and closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3050

Also added a couple of rake tasks that might be useful.

See merge request !4732

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:46:55 +02:00
Achilleas PipinellisandRémy Coutable f81259d136 Merge branch 'ci-git' into 'master'
Document `GIT_STRATEGY` and `GIT_DEPTH`

## What does this MR do?

Documents `GIT_STRATEGY` and `GIT_DEPTH`. Also fixes the TOC since the anchors weren't working.

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

The TOC and the location of the new entries.

## Why was this MR needed?

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188

## Screenshots (if relevant)

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

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

/cc @axil @ayufan

See merge request !4720

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:45:15 +02:00
Achilleas PipinellisandRémy Coutable bdaced56b4 Merge branch 'ci-wording' into 'master'
* Adds pipelines page to CI docs.
* Adds image of pipelines list (although currently missing border that is on other images).
* Changes CI to CI/CD in `/doc` and `/doc/ci`
* Sorts user documentation in `/doc`

Partially fixes #17733.

See merge request !4660

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:43:46 +02:00
Achilleas PipinellisandRémy Coutable 1a2e4aae95 Merge branch 'doc_refactor_labels' into 'master'
Refactor labels docs

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

See merge request !3347

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:43:30 +02:00
Rémy Coutable a600097188 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

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:38:00 +02:00
Douwe MaanandRémy Coutable 9be991df54 Merge branch 'fix-auto-mr-close' into 'master'
Fix auto-MR-close text from branch name

See merge request !4836

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:34:52 +02:00
Rémy Coutable 7ba628b05d Fix CHANGELOG
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:31:59 +02:00
Rémy Coutable 0d457d8d86 Update VERSION to 8.9.0 v8.9.0 2016-06-22 11:02:18 +02:00
Dmitriy ZaporozhetsandRobert Speicher 04827fcb40 Merge branch '18533-graphs-wiki-subnav' into 'master'
Resolve "Graphs and Wiki subnav"

Styles sub nav in `Wiki` and `Graphs`

Closes #18533

![Screen_Shot_2016-06-15_at_9.32.43_AM](/uploads/111dae6e1b9c7d8038ac88b9be6f76a2/Screen_Shot_2016-06-15_at_9.32.43_AM.png)

cc @dzaporozhets

See merge request !4678
2016-06-21 19:47:36 -04:00
Douwe MaanandRobert Speicher ba48ed8630 Merge branch 'update-mail_room-to-0.8.0' into 'master'
Update mail_room to 0.8.0 to resolve #13357

Update mail_room to 0.8.0 to resolve #13357

Which includes the fix from:
https://github.com/tpitale/mail_room/pull/73

See merge request !4835
2016-06-21 19:41:28 -04:00
Dmitriy ZaporozhetsandRobert Speicher 93004a8cb0 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 19:41:28 -04:00
Robert Speicher e8c70d49ee Update VERSION to 8.9.0-rc8 v8.9.0-rc8 2016-06-21 16:01:26 -04:00
Jacob SchatzandRobert Speicher ea9309f9a5 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 15:43:17 -04:00
Robert SpeicherandRobert Speicher 6e654c2f98 Merge branch 'update-browser-gem' into 'master'
Update browser gem to 2.2.0

A user with a certain browser would hit an Error 500:

```
ArgumentError: invalid value for Float(): "0."
  from browser/accept_language.rb:45:in `Float'
  from browser/accept_language.rb:45:in `quality'
  from browser/accept_language.rb:15:in `each'
  from browser/accept_language.rb:15:in `sort_by'
  from browser/accept_language.rb:15:in `parse'
  from browser/base.rb:13:in `initialize'
  from browser.rb:125:in `new'
  from browser.rb:125:in `block in new'
  from browser.rb:125:in `map'
  from browser.rb:125:in `new'
  from browser/action_controller.rb:15:in `browser'
  from abstract_controller/helpers.rb:67:in `browser'
  from app/views/layouts/_head.html.haml:38:in `_app_views_layouts__head_html_haml__1626593241142487258_59224880'
```

The root cause when the `Accept-Language` header would contain a float for the quality value (e.g. en-GB,en;q=0.v5).

Fixes https://github.com/fnando/browser/issues/241

Seen today via Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/7644/

See merge request !4811
2016-06-21 15:22:18 -04:00
Robert SpeicherandRobert Speicher 7b0466e091 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 14:46:51 -04:00
Robert SpeicherandRobert Speicher ef54aa69a3 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 14:25:30 -04:00
Achilleas PipinellisandRobert Speicher 82eed5f12c Merge branch 'add_link_to_sidekiq_api' into 'master'
Add missing link to sidekiq metrics in API README



See merge request !4837
2016-06-21 14:16:32 -04:00
Jacob SchatzandRobert Speicher 4f74e79ea3 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 14:15:26 -04:00
Jacob SchatzandRobert Speicher cd2967656b Merge branch 'fix-button-title' into 'master'
Capitalize button text

Capitalizes button text to match the rest.

See merge request !4834
2016-06-21 13:18:45 -04:00
Jacob SchatzandRobert Speicher edf96e78e5 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 13:17:33 -04:00
Jacob SchatzandRobert Speicher d9bf70b934 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 13:16:59 -04:00
Jacob SchatzandRobert Speicher 355310ba98 Merge branch '17521-gitlab-ci-yml-templates' into 'master'
GitLab CI Yaml template dropdown

## What does this MR do?
Make it possible to select a dropdown for an easy start with GitLab CI.

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

## TODO
- [ ] Backend
  - [x] CHANGELOG item
  - [x] Fix rubocop failure
  - [x] API Support
  - [x] New tests
  - [x] Add disclaimer to the top of the gitlab-ci.yml
- [ ] Frontend
  - [x] New tests

See merge request !4411
2016-06-21 12:17:47 -04:00
Rémy CoutableandRobert Speicher e4938c6ed2 Merge branch 'feature/runner-lock-on-project' into 'master'
Make it possible to lock runner on a specific project

Make it possible to lock runner on a specific project.

![Screen_Shot_2016-06-20_at_4.03.08_PM](/uploads/186378643a20106ff0b67b6fd8bd7f28/Screen_Shot_2016-06-20_at_4.03.08_PM.png)

----

![Screen_Shot_2016-06-20_at_9.54.52_PM](/uploads/c479abdffaf19f383bb6b5a42bdd6cc3/Screen_Shot_2016-06-20_at_9.54.52_PM.png)

----

![Screen_Shot_2016-06-20_at_9.56.26_PM](/uploads/6ad838679b0c28a1fe2e20e9224387ea/Screen_Shot_2016-06-20_at_9.56.26_PM.png)

Closes #3407

See merge request !4093
2016-06-21 12:17:20 -04:00
Dmitriy ZaporozhetsandRobert Speicher 5a93a592e7 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 12:11:06 -04:00
Rémy CoutableandRobert Speicher 7315401ebd Merge branch 'fix/builds-api-nil-commit' into 'master'
Fix builds API response that did not include commit data

## What does this MR do?

This is fix for problem with builds API response not including information about commit this build is created for.

## What are the relevant issue numbers?

Closes #18476 

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- 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 !4827
2016-06-21 12:08:15 -04:00
Rémy CoutableandRobert Speicher 421b5aafbc Merge branch 'show-image-id-on-registry-page' into 'master'
Show proper image ID on registry page

## What does this MR do?
Display the container registry image ID (from the config blob) instead of the first image layer ID

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

## Why was this MR needed?
To show proper image ID on container_registry page.
This only supports manifest V2, since the manifest V1 doesn't expose information about Image ID.

## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18159.

## Screenshots (if relevant)
![Screen_Shot_2016-06-21_at_13.16.44](/uploads/db0d3ed8c8b90fafc8dbf1644c2354b0/Screen_Shot_2016-06-21_at_13.16.44.png)

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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 !4821
2016-06-21 12:07:57 -04:00
Jacob SchatzandRobert Speicher f86308c1dc 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 12:07:30 -04:00
Yorick PeterseandRobert Speicher 1829af43d6 Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master'
Optimize Banzai::Filter::RelativeLinkFilter

See merge request !4813
2016-06-21 12:07:09 -04:00
Robert SpeicherandRobert Speicher 42cd3d3d27 Merge branch 'fix/import-sources' into 'master'
Add missing import source

I realised https://gitlab.com/projects/new is missing the `gitlab export` option, while this worked fine in GDK it seems that something was missing here.

This _should_ fix it unless I'm missing any other `import_sources` (did a grep and couldn't find it anywhere else though).

See merge request !4825
2016-06-21 12:06:40 -04:00
Dmitriy ZaporozhetsandRobert Speicher ddea2e3f25 Merge branch '18881-horizontal-nav-arrow' 2016-06-21 12:05:27 -04:00
Yorick PeterseandRobert Speicher 2a1085a9f1 Merge branch '18792-cache-participants-call' into 'master'
Cache Participable#participants in instance variable

See merge request !4803
2016-06-21 12:05:00 -04:00
Yorick PeterseandRobert Speicher 06a1f4989e Merge branch '18709-reduce-git-calls' into 'master'
Remove calls to Rugged::BranchCollection#each from extracts_path before_action

See merge request !4802
2016-06-21 12:04:34 -04:00
Stan HuandRobert Speicher 88d6fe9020 Merge branch '18757-fix' into 'master'
Fallback to group's owners/masters when a project has none for the "access requested email"

## What does this MR do?

From b31c5052f9:

    Fallback to group's owners/masters when a project has none
    
    A project in a group can have no explicit owners/masters,
    in that case we fallbacks to the group's owners/masters.

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

No.

## Why was this MR needed?

Because of #18757.

## What are the relevant issue numbers?

Fixes #18757.

## Does this MR meet the acceptance criteria?

- [x] No need for CHANGELOG.
- [x] No need for documentation.
- [x] No API support added.
- [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 !4791
2016-06-21 12:02:44 -04:00
Jacob SchatzandRobert Speicher 67913ad224 Merge branch 'fix-list-style' into 'master'
Make lists on notes to look the same in preview mode and published

## What does this MR do?
Makes list styles on notes to be the same. Previously the styles weren't shared.

## Screenshots (if relevant)
**Previous**

![label-style-old](/uploads/f121fe99e9255cf0d75185185f51fec2/label-style-old.gif)

**After**

![label-style](/uploads/23febf41aaf8796d250a662fa6dc15d2/label-style.gif)

See merge request !4765
2016-06-21 12:01:53 -04:00