Commit Graph
30190 Commits
Author SHA1 Message Date
Connor Shea d032f37001 Add merge request data to the progress information on Milestones pages.
Fixes #13980.
2016-06-16 14:21:40 -06:00
Jacob Schatz 38d0b5b54e Merge branch 'media-query-bug' into 'master'
Fix project header alignment media query bug

## What does this MR do?
Fixes media query bug on project header

## Screenshots (if relevant)
![Screen_Shot_2016-06-15_at_3.22.20_PM](/uploads/3d84f8ffb88c316f317048e15ffea4f3/Screen_Shot_2016-06-15_at_3.22.20_PM.png)

See merge request !4689
2016-06-16 18:47:48 +00:00
Jacob Schatz af1574e041 Merge branch 'dz-fix-mr-widget-padding' into 'master'
Add bottom padding for merge request command line text

Because without bottom padding text is too close to the UI tabs - hard to navigate



See merge request !4681
2016-06-16 18:46:50 +00:00
Jacob Schatz 7b18e8c744 Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' into 'master'
Avoid a TypeError when initializing MergeRequest JS class with no arg

## What does this MR do?

Avoid a TypeError when initializing MergeRequest JS class with no arg.

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

No.

## Why was this MR needed?

Without this sane default you would get the following error when you
tried to instantiate a new MergeRequest object with no argument (i.e.
`new MergeRequest();`):
    
    TypeError: undefined is not an object (evaluating 'this.opts.action')

## What are the relevant issue numbers?

Fixes #13525.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG since it's a trivial internal change
- [x] Tests
  - [x] 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 !4667
2016-06-16 18:32:23 +00:00
Jacob Schatz 280c95fc4a Merge branch 'mr-download-dropdown-alignment' into 'master'
Fixed alignment of download dropdown

## What does this MR do?

Correctly aligns the download dropdown on merge requests

## Screenshots (if relevant)

![Screen_Shot_2016-06-14_at_14.47.06](/uploads/9381f25110e5573e56aa5c3f46786df5/Screen_Shot_2016-06-14_at_14.47.06.png)

See merge request !4646
2016-06-16 17:59:32 +00:00
Jacob Schatz e11aae1a07 Merge branch 'push-event-banner-container' into 'master'
Fixed last push event banner not being in container

## What does this MR do?

Adds the last push event content into a container with the correct class.

## What are the relevant issue numbers?

Closes #18567 

## Screenshots (if relevant)

![Screen_Shot_2016-06-14_at_13.17.41](/uploads/4afa3d2c73e59c5ffbd53869e49baa92/Screen_Shot_2016-06-14_at_13.17.41.png)

See merge request !4644
2016-06-16 17:58:57 +00:00
Jacob Schatz 3e6f4a51f9 Merge branch 'diff-scroll-point' into 'master'
Fixed issue when opening a highlighted line diff

## What does this MR do?

With the new project nav being fixed, the diff page is scrolling the highlighted under the nav meaning you cant see what is highlighted. This corrects that by added the height of the new project nav into the offset.

See merge request !4597
2016-06-16 17:33:45 +00:00
Jacob Schatz a44a5fd487 Merge branch 'template_dropdown' into 'master'
Implements TemplateDropdown class to create custom template dropdowns

## What does this MR do?
Refactorize template dropdowns. This MR creates a base TemplateSelector class so it can be reused for multiple types of templates.

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

See merge request !4697
2016-06-16 17:29:45 +00:00
Jacob Schatz 666b565168 Merge branch 'build-scroll-controls-on-complete' into 'master'
Shows build scroll buttons after build is complete

## What does this MR do?

Shows the build scroll buttons whenever there is a build trace. Previously they were only shown when the build was active.

## What are the relevant issue numbers?

Closes #18515 

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_11.42.42](/uploads/6e0577f46a0cc7b4f2f13b17c85d97da/Screen_Shot_2016-06-13_at_11.42.42.png)

See merge request !4621
2016-06-16 16:52:23 +00:00
Douwe Maan db66312cdb Merge branch '18474-missing-images-on-confirmation-email' into 'master'
Fix images in emails

Closes #18474. The confirmation email is actually the only one that uses the `image_tag` helper at the moment, but this will work for all of them:
```shell
$ ag image_tag -G mailer
app/views/layouts/devise_mailer.html.haml
13:              = image_tag('mailers/gitlab_header_logo.png', id: 'logo', alt: 'GitLab Wordmark')
24:                  = image_tag('mailers/gitlab_tanuki_2x.png', alt: 'GitLab Logo')
```

See merge request !4705
2016-06-16 14:50:05 +00:00
Jacob Schatz d9812bae49 Merge branch '18521-tanuki-logo' into 'master'
Lighten each logo path color instead of white

## What does this MR do?
Changes highlight/loading colors of tanuki from white to a lighter version of each path color

## Why was this MR needed?
Since the logo is no longer on the dark sidebar, the highlight color was getting lost against the light gray background

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

## Screenshots (if relevant)
![logo](/uploads/3743925862fa8e17d2fec426f7e4c853/logo.gif)

cc @jschatz1 @lbennett @dzaporozhets 

See merge request !4690
2016-06-16 13:49:27 +00:00
Yorick Peterse 0ea170b44d Merge branch '18582-banzai-filter-external-link-filter' into 'master'
Banzai::Filter::ExternalLinkFilter use XPath

See merge request !4702
2016-06-16 13:22:41 +00:00
Annabel Dunstone cfbf88f029 Fix indentation scss-lint errors 2016-06-16 08:15:01 -05:00
Stan Hu 3fdf104b96 Merge branch 'gitlab_git-10.1.4' into 'master'
Use gitlab_git 10.1.4

Towards https://gitlab.com/gitlab-org/gitlab-ce/issues/18690,
following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/87 .

See merge request !4706
2016-06-16 12:51:56 +00:00
Paco Guzman ae6a54f73c Banzai::Filter::ExternalLinkFilter use XPath 2016-06-16 14:13:29 +02:00
Rémy Coutable 46bba4e758 Merge branch 'fix/status-of-pipeline-without-builds' into 'master'
Improve pipeline status in case that pipeline has no jobs

## What does this MR do?

This MR resolves problem with pipeline status when there are no build in pipeline.

This can happen when builds were skipped - for example - by using `only`/`except` keyword in `.gitlab-ci.yml`.

## What are the relevant issue numbers?

Closes #17977

See merge request !4403
2016-06-16 11:48:36 +00:00
Jacob Vosmaer 18d4bd9564 Use gitlab_git 10.1.4 2016-06-16 13:20:12 +02:00
Yorick Peterse c369cc8bf4 Merge branch '18591-banzai-filter-upload-link-filter' into 'master'
Banzai::Filter::UploadLinkFilter use XPath

See merge request !4703
2016-06-16 10:47:29 +00:00
Sean McGivern 5eb9cb68f7 Fix images in emails 2016-06-16 11:47:01 +01:00
Douwe Maan 077e32740c Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master'
Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460)

## What does this MR do?

It improves the check we use to display or not the members' access and controls in the members list.

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

No, I replaced an helper with just a permission check so I think it's a better solution.

## Why was this MR needed?

There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR.

## What are the relevant issue numbers?

None.

## Does this MR meet the acceptance criteria?

- No CHANGELOG needed
- [x] Tests
  - [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 !4670
2016-06-16 09:54:53 +00:00
Rémy Coutable 5b4e99387a Merge branch 'group-owners-association' into 'master'
Turn Group#owners into a has_many association

## What does this MR do?

This turns the regular method `Group#owners` into a `has_many` association.

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

As far as I can tell there's no way to do this without using an intermediate association, but perhaps I'm missing something. The reason an intermediate association is needed is because the supplied Proc is applied to the _final_ association (the one returning users), this means that when using a single `has_many` you can't filter out any intermediate rows (e.g. group members).

## Why was this MR needed?

This code being a regular method would prevent eager loading of the owners of a Group, turning it into a `has_many` association resolves this problem. This was discovered in !4410.

## What are the relevant issue numbers?

None.

## 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
  - [ ] All builds are passing
- [x] 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 !4676
2016-06-16 09:37:55 +00:00
Paco Guzman 46696bde83 Banzai::Filter::UploadLinkFilter use XPath 2016-06-16 11:26:56 +02:00
Valery Sizov 1d20eefdcf Merge branch 'fix-environments-db' into 'master'
Make project_id nullable

## What does this MR do?
Fixes the broken migration which is not in sync with `db/schema.rb`.

It's to solve https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/469.


See merge request !4701
2016-06-16 09:26:39 +00:00
Yorick Peterse 84e2be5a5f Turn Group#owners into a has_many association
This allows the owners to be eager loaded where needed.
2016-06-16 11:10:41 +02:00
Kamil Trzcinski dda94e0406 Make project_id nullable 2016-06-16 10:43:47 +02:00
Yorick Peterse 1b43f51ad0 Merge branch 'fix_migration_style_guide' into 'master'
Update migration_style_guide.md with new details

See merge request !4693
2016-06-16 08:02:36 +00:00
Alfredo Sumaran e8a467e094 Implements TemplateDropdown class to create custom template dropdowns
Also License dropdown has been ported to use our GL dropdown instead of Select2.
Fixes tests to make it work with current implementation
2016-06-16 00:28:45 -05:00
Jacob Schatz e507a84c33 Merge branch 'hide-todo-collapsed-sidebar' into 'master'
Hide the Todo button in the collapsed issuable sidebar.

## What does this MR do?

Fixes a bug where the "Add Todo" button was displayed in the collapsed sidebar.

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

This shouldn't remove any other elements from the collapsed sidebar.

## What are the relevant issue numbers?

None

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-15_at_11.41.46_AM](/uploads/27a1ace58cf8c44ad96accd3d0b32f11/Screen_Shot_2016-06-15_at_11.41.46_AM.png)

After:

![Screen_Shot_2016-06-15_at_11.40.53_AM](/uploads/91a8585680fc482682d0efafdba4d599/Screen_Shot_2016-06-15_at_11.40.53_AM.png)

See merge request !4686
2016-06-16 02:32:37 +00:00
Jacob Schatz 297f4b4599 Merge branch 'long-commit-message-scroll-fix' into 'master'
Fix long commit message scroll issue.

Fixes horizontal scrollbar for long commit description.

## Before
![before_](/uploads/d261e26044d8ab451bc7768b16316253/before_.png)

## After
![after](/uploads/f27227a77d25d80b797e3ffc916d1957/after.png)

See merge request !4643
2016-06-16 00:32:24 +00:00
Jacob Schatz a44d07d482 Merge branch 'category-search-dropdown' into 'master'
Show categorised search queries in the search autocomplete

Fixes #5885 

It works in 3 categories, Dashboard, Groups and Project.

## Dashboard context
![for-dashboard](/uploads/3a59f6ec008a972495597c8f2691c385/for-dashboard.png)

## Group context
![for-group](/uploads/f7aa413d56330a1d9b2e5562f95badf7/for-group.png)

## Project context
![for-project](/uploads/dabe04cf8758a056cf7b03da001ffd91/for-project.png)


## Screencast
![category-search-dropdown](/uploads/4d9513dcd6ccb6e24adefdf65f9bc778/category-search-dropdown.gif)



See merge request !4499
2016-06-16 00:30:56 +00:00
Fatih Acet 14b259fe2b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into long-commit-message-scroll-fix 2016-06-16 02:24:19 +03:00
Fatih Acet fe125f8dc9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee
2016-06-16 02:04:09 +03:00
Jacob Schatz 5d16d50ceb 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-15 22:48:39 +00:00
Jacob Schatz 433e0a41cb Merge branch 'award-emoji-fix' into 'master'
Fix emoji block selector.

Fixes #18465 and #18577

See merge request !4604
2016-06-15 22:39:32 +00:00
Robert Speicher 102f4d8dd7 Merge branch 'update-changelog' into 'master'
Update CHANGELOG

[ci skip]

See merge request !4695
2016-06-15 22:21:57 +00:00
Jacob Schatz cb534cda13 Merge branch 'revert-b4e8d59b' into 'master'
Revert "Merge branch '18047-event-item-links-dont-look-like-links' into 'master'"

## What does this MR do?

## 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)

## 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)
- [ ] 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 !4692
2016-06-15 22:19:33 +00:00
Douglas Barbosa Alexandre 1f81137bb4 Update CHANGELOG for 8.7.7 release
[ci skip]
2016-06-15 19:18:35 -03:00
Douglas Barbosa Alexandre cb9bab945b Update CHANGELOG for 8.6.9 release
[skip]
2016-06-15 19:18:35 -03:00
Douglas Barbosa Alexandre 77554eee57 Update CHANGELOG for 8.5.13 release
[ci skip]
2016-06-15 19:18:32 -03:00
Douglas Barbosa Alexandre 510b2522f6 Update CHANGELOG for 8.4.11 release
[ci skip]
2016-06-15 19:18:26 -03:00
Douglas Barbosa Alexandre 2c26ba42c0 Update CHANGELOG for 8.3.10 release
[ci skip]
2016-06-15 19:08:47 -03:00
Douglas Barbosa Alexandre 8d6cfd7922 Update CHANGELOG for 8.2.6 release
[ci skip]
2016-06-15 18:39:45 -03:00
Drew Blessing 8033afd817 Update migration_style_guide.md with new details 2016-06-15 21:38:12 +00:00
Jacob Schatz 44df30c4c0 Revert "Merge branch '18047-event-item-links-dont-look-like-links' into 'master'"
This reverts merge request !4544
2016-06-15 21:18:04 +00:00
Annabel Dunstone e4b32e4941 Update CHANGELOG 2016-06-15 16:13:21 -05:00
Jacob Schatz 1a832c8f00 Merge branch 'network-assets' into 'master'
Replace raphael-rails with raphael.js and split it from the rest of the JS

## What does this MR do?

Removes raphael.js and its related libraries from the default JS bundle.

It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it.

This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB.

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

That tests pass and that there aren't errors on any pages (especially the Network page).

## Why was this MR needed?

It's only used on the Network page and was using way too much bandwidth for just one page.

## What are the relevant issue numbers?

#14372 #13165 

Follow-up to !4394 and !4516.

cc: @jschatz1 

See merge request !4519
2016-06-15 21:11:31 +00:00
Annabel Dunstone 433a65db77 Lighten each logo path color instead of white 2016-06-15 16:09:38 -05:00
Jacob Schatz b4e8d59b0e Merge branch '18047-event-item-links-dont-look-like-links' into 'master'
Updated '.event-item a' color

## What does this MR do?

Changes the color of `.event-item` links.

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

Did you want this restricted only to the activity page or anywhere showing `.event-item`'s?

## Why was this MR needed?

UX

## What are the relevant issue numbers?

Closes #18047.

## Screenshots (if relevant)

![Screen_Shot_2016-06-08_at_20.07.54](/uploads/9670fbeb6fac7a334a83e11ffc05148c/Screen_Shot_2016-06-08_at_20.07.54.png)

See merge request !4544
2016-06-15 20:56:32 +00:00
Jacob Schatz dd184d304a Merge branch '18301-top-navigation-needs-hover-state' into 'master'
added hover state to top nav links

## What does this MR do?

Adds hover state to top nav links.

## 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 #18301.

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_23.23.45](/uploads/dac8ed99eca99fbcccbd98028e947ee1/Screen_Shot_2016-06-07_at_23.23.45.png)

See merge request !4521
2016-06-15 20:55:09 +00:00
Jacob Schatz f0c58c72a9 Merge branch 'milestone-date-clear' into 'master'
Due date can be removed from milestones

## What does this MR do?

Adds a button to milestone form to allow user to remove due date 

## What are the relevant issue numbers?

Closes #15063 

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_08.32.03](/uploads/8bd4446abde745dd5b1e140a887ec694/Screen_Shot_2016-06-02_at_08.32.03.png)

See merge request !4428
2016-06-15 20:52:09 +00:00