30187 Commits
Author SHA1 Message Date
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
Dmitriy ZaporozhetsandRobert Speicher 6975a8c3b9 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 12:01:33 -04:00
Achilleas PipinellisandRobert Speicher ab38557c7d Merge branch '18584-document-request-access-feature' into 'master'
Document access request to project & group

## What does this MR do?

Adds documentation that was missing from !3798.

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

I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome!

## What are the relevant issue numbers?

Closes #18584.

## Does this MR meet the acceptance criteria?

- [ ] Tests
  - [ ] 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)

/cc @DouweM 

See merge request !4685
2016-06-21 12:00:35 -04:00
Jacob SchatzandRobert Speicher a18221bfac Merge branch 'lbennett/gitlab-ce-18113-edit-note-shortcut-conflicting' into 'master'
Stop edit note up key shortcut conflicting with native shortcuts

## What does this MR do?

Restricts edit note shortcut to only the `up` button, if modifier keys are used it will not fire the shortcut.

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

Ney.

## Why was this MR needed?

UX

## What are the relevant issue numbers?

Closes #18113.

## 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 !4761
2016-06-21 11:58:39 -04:00
Jacob SchatzandRobert Speicher 61b59fea1c 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 11:58:05 -04:00
Jacob SchatzandRobert Speicher 1bf82c2b7f Merge branch 'lbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentation' into 'master'
Documented the up key shortcut

## What does this MR do?

Documents the `up` key edit note shortcut in the `/help/_shortcuts.html.haml` help pane and the `/doc/workflow/shortcuts.png` screenshot.

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

The issue and MR shortcuts should be merged, they're the same? Shall I open an issue or include here?

This panel also need to be a little more responsive. Shall I open an issue or include here?

Additionally, I have some conflicts regarding the screenshot. This screenshot also needs to update for !4570.

## Why was this MR needed?

Everyone should know about this awesome shortcut.

## What are the relevant issue numbers?

Closes #18114.

## Screenshots (if relevant)

View the [updated screenshot](https://gitlab.com/gitlab-org/gitlab-ce/blob/e7221ad66efeb0f7d263ead7ed523d194243fb09/doc/workflow/shortcuts.png)

## 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)
- [ ] 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 !4758
2016-06-21 11:57:49 -04:00
Jacob SchatzandRobert Speicher cfa3d881a7 Merge branch 'lbennett/gitlab-ce-18490-top-area-css-tablet-view' into 'master'
Corrected top search area css media query param

## What does this MR do?

Corrects top search area css media query so it switches styles at the correct screen size.

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

It's a regression so likely

## Why was this MR needed?

UX

## What are the relevant issue numbers?

Closes #18490. (This stops the search bar dropping into its own row until it needs to be 100% column stacked anyway)

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_17.45.38](/uploads/2278e2cdb1c2de14fc098e30fd5328d8/Screen_Shot_2016-06-17_at_17.45.38.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 !4756
2016-06-21 11:56:59 -04:00
Yorick PeterseandRobert Speicher 52e11841fe Merge branch '18760-remove-explicate-assignment-on-metrics-action' into 'master'
Remove explicit Gitlab::Metrics.action assignments, are already automatic.

See merge request !4731
2016-06-21 11:56:19 -04:00
Jacob SchatzandRobert Speicher 88762085dc Merge branch 'fix-merge-on-success-widget-buttons' into 'master'
Fixed merge on success widget buttons on mobile

## What does this MR do?

Fixes 'merge on success' widget buttons on mobile as they were stacked with 100% width before when it is a button group with a small dropdown button.

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

Ney

## Why was this MR needed?

mobile UX

## What are the relevant issue numbers?

Closes #18610.

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_03.09.36](/uploads/b662e1b7ad683cd89f1233a859caccb2/Screen_Shot_2016-06-17_at_03.09.36.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 !4726
2016-06-21 11:55:08 -04:00
Achilleas PipinellisandRobert Speicher 372e962aef Merge branch 'email-on-push' into 'master'
Document email on push service

Addresses https://gitlab.com/gitlab-org/gitlab-ee/issues/80

See merge request !4698
2016-06-21 11:54:23 -04:00
Jacob SchatzandRobert Speicher 64e9d9b443 Merge branch 'empty-state-project-page' into 'master'
Fix regressions in the design of the project statistics bar.

## What does this MR do?

Improves the design of the empty Changelog, Contribution guide, and License items in the project statistics bar.

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

Don't think so, maybe that the `project-stats` class isn't used anywhere else (a grep suggests it's not)

## Why was this MR needed?

Because the empty state of the repository didn't look as good anymore.

## What are the relevant issue numbers?
#18734

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-16_at_12.15.22_PM](/uploads/a5c27d696af186346a2298071c90ba2d/Screen_Shot_2016-06-16_at_12.15.22_PM.png)

After:

![Screen_Shot_2016-06-16_at_12.59.38_PM](/uploads/8719d3ee507affd4ce7ea479a5422908/Screen_Shot_2016-06-16_at_12.59.38_PM.png)

See merge request !4717
2016-06-21 11:54:12 -04:00
Jacob SchatzandRobert Speicher 761212ac9d Merge branch 'diff-commit-id-weight' into 'master'
Fixes font weight of commit id on view file button

## What does this MR do?

Changes the weight to normal. With the new commit UI - this had turned bold and didn't match the designs.

Should it also be our normal font family? According to designs it is - but everywhere else there is a commit ID it has the monospace font.

## Screenshots (if relevant)

![Screen_Shot_2016-06-16_at_17.25.33](/uploads/bb76d576c10be65172d5f4e9790ca766/Screen_Shot_2016-06-16_at_17.25.33.png)

See merge request !4713
2016-06-21 11:53:43 -04:00
Jacob SchatzandRobert Speicher 560cea74bc Merge branch 'image-border' into 'master'
Add borders to images in issues, MRs, and Help.

## What does this MR do?

Adds a gray border around images in Issues, MRs, and Help pages.

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

That this doesn't effect other elements or pages that it shouldn't.

## Why was this MR needed?

It was hard to differentiate between the actual interface and screenshots of it.

## What are the relevant issue numbers?

Fixes #18578 

## Screenshots (if relevant)

### Issues/MRs

Before:

![Screen_Shot_2016-06-14_at_12.22.08_PM](/uploads/00a242a5b4a09b5308f02e6e498862a8/Screen_Shot_2016-06-14_at_12.22.08_PM.png)

After:

![Screen_Shot_2016-06-14_at_12.22.30_PM](/uploads/8fc9fc1c561d788b050e48373449771b/Screen_Shot_2016-06-14_at_12.22.30_PM.png)

![Screen_Shot_2016-06-14_at_12.22.39_PM](/uploads/36c91b2f2ce1eeb77f1646415baea14d/Screen_Shot_2016-06-14_at_12.22.39_PM.png)

### Help

Before:

![Screen_Shot_2016-06-14_at_11.58.54_AM](/uploads/7620491ca338064b872efb538b0bf4f3/Screen_Shot_2016-06-14_at_11.58.54_AM.png)

After:

![Screen_Shot_2016-06-14_at_11.58.57_AM](/uploads/d9fcfcac0f70dde4e69ff4263e369f65/Screen_Shot_2016-06-14_at_11.58.57_AM.png)

## Does this MR meet the acceptance criteria?

- [x] [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

See merge request !4655
2016-06-21 11:53:12 -04:00
Jacob SchatzandRobert Speicher 762c8a986b Merge branch 'note-emoji-system-note' into 'master'
Hides award emoji & access level on system notes

## What does this MR do?

Hides award emoji & access level on system notes as they aren't applicable to them notes.

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png)

See merge request !4629
2016-06-21 11:52:25 -04:00
Jacob SchatzandRobert Speicher 605e122952 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 11:52:06 -04:00
Jacob SchatzandRobert Speicher 16b4218791 Merge branch 'async-refs-dropdown' into 'master'
Refs dropdown is now loaded async

## What does this MR do?

The refs dropdown is loaded async so not to block the page.

## What are the relevant issue numbers?

Part of #18202

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png)

See merge request !4508
2016-06-21 11:51:23 -04:00
Rémy CoutableandRobert Speicher 6d0f9bbc6b Merge branch 'ci-lfs-fetch' into 'master'
Allow to fetch LFS from CI

## What does this MR do?

This adds support for fetching LFS object from CI jobs (mostly it's made for supporting GitLab CI).

## What is left?

- [x] Write tests covering a new authorization mechanism

cc @grzesiek @marin

See merge request !4465
2016-06-21 11:50:51 -04:00
Rémy CoutableandRobert Speicher 95621c0118 Merge branch '17949-error-500-on-gitlab-org-when-visiting-pipelines' into 'master'
Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view

## What does this MR do?

Sets a default stage on old `ci_builds`.

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

Is the migration acceptable for online execution?

## Why was this MR needed?

Old `ci_builds`with no stages cause a regression on the pipelines index view.

## What are the relevant issue numbers?

#17949 

Blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4680


See merge request !4381
2016-06-21 11:49:32 -04:00
Yorick PeterseandRobert Speicher ff5b073e2f Merge branch 'issue_12758_2' into 'master'
Add notification_settings:events to schema

See merge request !4800
2016-06-20 12:17:03 -04:00
Jacob SchatzandRobert Speicher 4b7343f7ac Merge branch 'star-fork-mobile' into 'master'
Display Star and Fork on mobile, fix #18537.

## What does this MR do?

Displays the Star and Fork buttons on mobile devices.

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

Nope.

## Why was this MR needed?

I wanted to star and/or fork projects while on my phone, I couldn't do that before.

## What are the relevant issue numbers?

#18537 

## Screenshots (if relevant)

![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png)

cc: @jschatz1 

See merge request !4714
2016-06-20 12:16:31 -04:00
Jacob SchatzandRobert Speicher 0d57e94477 Merge branch 'toggle-whitespace-button-for-compare-page' into 'master'
Toggle whitespace button for compare page

## What does this MR do?

Adds whitespace button to compare branches page.

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

Ruby code.

## Why was this MR needed?

Compare branches UX

## What are the relevant issue numbers?

Closes #17881.

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png)

## Does this MR meet the acceptance criteria?

- [x] [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 !4569
2016-06-20 12:16:18 -04:00
Jacob SchatzandRobert Speicher 13fa884ee4 Merge branch '18714_bulk_assign_labels_icon' into 'master'
Fixes item icon state when for issues that have the same labels assigned

## What does this MR do?
Previously if all issues had the same labels the dropdown was showing the labels with indeterminate stated which is wrong. This MR fixes that and shows the correct state.

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

## Screenshots (if relevant)

**Before**

![label-before](/uploads/c65aa051e773dfea898a0d19767d6ade/label-before.gif)

**After**

![label](/uploads/73fd657d104d1081e189e0a9547d483b/label.gif)

## 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
- [ ] 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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4721
2016-06-20 12:02:02 -04:00
Jacob SchatzandRobert Speicher 4d8e96152d Merge branch 'pinned-nav-cookie-path' into 'master'
Set path for pinned nav cookie

## What does this MR do?

Sets a path for the pinned nav cookie so it will be present across page reload.

Closes #18836 

See merge request !4784
2016-06-20 11:52:23 -04:00
Jacob SchatzandRobert Speicher e18a9d4429 Merge branch 'mr-button-placement' into 'master'
Fixed placement of close button on merge requests

## What does this MR do?

Fixes the order in which the MR buttons appear

## Screenshots (if relevant)

![Screen_Shot_2016-06-18_at_21.41.38](/uploads/66a88ebc287b7c21160af193ee9de54c/Screen_Shot_2016-06-18_at_21.41.38.png)

![Screen_Shot_2016-06-18_at_21.41.44](/uploads/ba8f6776d79f4eb0af7877c3c71fbb54/Screen_Shot_2016-06-18_at_21.41.44.png)


See merge request !4778
2016-06-20 11:52:13 -04:00