Commit Graph
30908 Commits
Author SHA1 Message Date
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
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
Alejandro Rodríguez ca696175db Optimize Banzai::Filter::RelativeLinkFilter
A lot of git operations were being repeated, for example, to build a url
    you would ask if the path was a Tree, which would call a recursive routine
    in Gitlab::Git::Tree#where, then ask if the path was a Blob, which would
    call a recursive routine at Gitlab::Git::Blob#find, making reference to
    the same git objects several times. Now we call Rugged::Tree#path, which
    allows us to determine the type of the path in one pass.

    Some other minor improvement added, like saving commonly used references
    instead of calculating them each time.
2016-06-21 10:53:16 -04:00
Rémy Coutable f411f83dbb 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 13:40:17 +00:00
Rémy Coutable 408110f824 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 13:17:11 +00:00
Rémy Coutable ed519c161b 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 13:05:35 +00:00
Grzegorz Bizon 92984783db Rename commit_data in Pipeline to commit 2016-06-21 14:43:37 +02:00
Grzegorz Bizon d9a64e9f41 Add Changelog entry for builds API commit data fix 2016-06-21 14:33:13 +02:00
Grzegorz Bizon dd08202a24 Fix builds API response not including commit data 2016-06-21 14:26:57 +02:00
Valery Sizov 1ddbbf358d Merge branch 'backport_from_ee' into 'master'
Fix of on-hover state for 'Edit' button on tree view

It's already reviewed and merged to EE, so it's just a back-port.

See merge request !4823
2016-06-21 11:54:34 +00:00
Valery Sizov c6b4106401 Fix on-hover state for 'Edit' button on tree view 2016-06-21 14:27:20 +03:00
Yorick Peterse 0468deafbd Merge branch '18792-cache-participants-call' into 'master'
Cache Participable#participants in instance variable

See merge request !4803
2016-06-21 11:25:44 +00:00
Kamil Trzcinski 70606bf0c1 Show proper image ID on registry page 2016-06-21 13:08:10 +02:00
Jacob Schatz 0d287b06a6 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 10:56:41 +00:00
Paco Guzman bfce7349ea Cache Participable#participants in instance variable 2016-06-21 12:54:12 +02:00
Phil Hughes c207b9e051 Tests update 2016-06-21 11:52:51 +01:00
Phil Hughes 62d16e515f Updated tests to not look for flash message 2016-06-21 11:20:06 +01:00
Phil Hughes 85a5e42576 Moved new environment link to below blank state text 2016-06-21 11:12:28 +01:00
Rémy Coutable f90c8c624d 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 10:08:42 +00:00
Alfredo Sumaran 3beff9e4a1 Fix tooltip title and persist state 2016-06-21 04:59:43 -05:00
Annabel DunstoneandAlfredo Sumaran 10220ef1e8 Update CHANGELOG 2016-06-21 04:59:15 -05:00
Annabel DunstoneandAlfredo Sumaran ef1e3d0df7 Add tooltip on pin/unpin nav 2016-06-21 04:59:15 -05:00
Yorick Peterse 027b07cab8 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 09:51:57 +00:00
Yorick Peterse 61f7c127a3 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 09:50:13 +00:00
Kamil Trzcinski 6bc22d95b8 Add test coverage to LFS fetching 2016-06-21 11:26:44 +02:00
Phil Hughes b5a718d1d7 Updated blank state for environments and deployments
Closes #18661
2016-06-21 09:54:15 +01:00
Lin Jen-Shin cdcbc8d721 Update wordings according to:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12594802
2016-06-21 16:32:50 +08:00
Kamil Trzcinski 2f545a15c0 Merge remote-tracking branch 'origin/master' into ci-lfs-fetch 2016-06-21 10:11:14 +02:00
Phil Hughes 472fe597e0 Fixed notification tests 2016-06-21 08:35:11 +01:00
Phil Hughes a4d4a7e635 Fixed issue with notification dropdownn not updating active
Changes bell icon to spinner to show the action is happening
Removed the flash message

Closes #18480
2016-06-21 08:35:11 +01:00
Achilleas Pipinellis a8957458f7 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 07:15:39 +00:00
Jacob Schatz 5804b6a0a2 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-20 20:23:16 +00:00
Jacob Schatz fc63251fd5 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-20 20:21:05 +00:00
Jacob Schatz 9e56cdb57a 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-20 20:20:26 +00:00
Jacob Schatz 1147f6406f 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-20 20:19:08 +00:00
Jacob Schatz 0f22a3a2b1 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-20 20:18:20 +00:00
Alfredo Sumaran 35383f33ac Add button to add .gitlab-ci.yml file 2016-06-20 15:06:36 -05:00
Jacob Schatz b635980d97 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-20 20:06:35 +00:00
Jacob Schatz 3b05752fbf 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-20 20:05:13 +00:00
Z.J. van de WegandAlfredo Sumaran bbfd62bc34 fixup! override content method 2016-06-20 14:48:28 -05:00
Alfredo Sumaran a18df1d15a Add feature test for gitab CI dropdown 2016-06-20 14:48:28 -05:00
Z.J. van de WegandAlfredo Sumaran 483dc62eaa Incorporate review 2016-06-20 14:48:28 -05:00
Z.J. van de WegandAlfredo Sumaran 96ae6099dd Run rake gitlab:update_templates 2016-06-20 14:48:28 -05:00
Z.J. van de WegandAlfredo Sumaran 8039856d80 Add changelog item, fix rubocop issue 2016-06-20 14:48:28 -05:00
Alfredo Sumaran 5d12189296 Add GitLab CI Yml dropdown selector 2016-06-20 14:48:28 -05:00