Commit Graph
31023 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 256cd8e498 Fix visibility of private project snippets for members when searching 2016-06-22 20:09:19 -03:00
Douglas Barbosa Alexandre 8f9b64c720 Fix internal snippets can be searched by anyone 2016-06-22 17:44:24 -03:00
Rémy Coutable 1d9bbb0b8e Fix CHANGELOG
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 16:14:27 +02:00
Achilleas Pipinellis 6f6c6f68ea Merge branch 'doc_refactor_labels' into 'master'
Refactor labels docs

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

See merge request !3347
2016-06-22 12:18:47 +00:00
Achilleas Pipinellis 7e42d4992c 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
2016-06-22 12:10:42 +00:00
Achilleas Pipinellis 564026f6af 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
2016-06-22 12:10:06 +00:00
Achilleas Pipinellis 78186c68ff Refactor labels documentation
- Add new images to match the new UI
- Document the new prioritize feature
2016-06-22 13:50:02 +02: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
Achilleas Pipinellis 79a9cfa375 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
2016-06-22 10:31:20 +00:00
Achilleas Pipinellis 2232b56d39 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
2016-06-22 10:30:40 +00:00
Achilleas Pipinellis e1917b56c6 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
2016-06-22 10:30:22 +00:00
Achilleas Pipinellis 193d7079a6 Merge branch 'master' into feature/import-export-docs 2016-06-22 11:48:00 +02:00
Achilleas Pipinellis 51b51de77d Give images proper names 2016-06-22 11:41:50 +02:00
Achilleas Pipinellis a41b468816 Add note about the shared directory 2016-06-22 11:31:07 +02:00
Achilleas Pipinellis 10016715c1 Add colons in item lists 2016-06-22 11:15:28 +02:00
Achilleas Pipinellis e023e66c9f Add note about enabling import/export in existing installations 2016-06-22 11:05:34 +02: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
Achilleas Pipinellis c0237a824b Remove old doc 2016-06-22 10:28:01 +02:00
Achilleas Pipinellis 39c434630a 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
2016-06-22 08:22:52 +00:00
Marin Jankovski 8436125e63 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
2016-06-22 08:00:26 +00:00
James Lopez 5adc085962 refactor to use haml instead 2016-06-22 08:48:18 +02:00
James Lopez 6eaf34685e Add note about settings 2016-06-22 06:06:50 +00:00
James Lopez d19379e00d fix typo 2016-06-22 07:39:08 +02:00
Mark Pundsack 82b32c286a Fix link 2016-06-21 22:15:21 -07: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
Douwe Maan 0909535ef7 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 22:58:14 +00:00
Dmitriy Zaporozhets 1cc3d14a6c Merge branch '18533-graphs-wiki-subnav' into 'master'
Resolve "Graphs and Wiki subnav"

## What does this MR do?
Styles sub nav in `Wiki` and `Graphs`

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

## Screenshots (if relevant)
![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 21:31:08 +00: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
Connor Shea a6faaace05 Expand on Award Emoji documentation, update/add screenshots. [ci skip] 2016-06-21 14:10:00 -06: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 2527ae6c60 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 19:15:54 +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
Achilleas Pipinellis 3f249a0cba 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 18:14:08 +00:00
Achilleas Pipinellis b2732f3af1 Refactor project import/export documentation 2016-06-21 20:07:52 +02: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
DJ Mountney 8b8cef4ca5 Add documentation and examples for configuring cloud storage for registry images. 2016-06-21 10:34:07 -07:00
Achilleas Pipinellis 0c61fad74c Move to new location
Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
2016-06-21 19:28:08 +02:00
James LopezandAchilleas Pipinellis 8b7224d91e updated based on feedback 2016-06-21 19:23:21 +02:00
James LopezandAchilleas Pipinellis acc1ea9d9f update screenshot with new changes 2016-06-21 19:23:21 +02:00