Commit Graph
30219 Commits
Author SHA1 Message Date
Rémy Coutable b2dc917601 Group owner cannot request access to a project of their group
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17 13:03:19 +02:00
Robert Speicher f011b86beb Merge branch 'rs-devise-emails' into 'master'
Customize all Devise mails

Continuing from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3354

See merge request !4297
2016-06-17 00:38:44 +00:00
Robert Speicher e71c64146a Merge remote-tracking branch 'dev/master' 2016-06-16 20:27:12 -04:00
Robert Speicher 03ba240fdd Update CHANGELOG for !4659
[ci skip]
2016-06-16 20:26:29 -04:00
Robert Speicher 79c28e1057 Merge branch 'remove_jiraissue' into 'master'
Remove JiraIssue model and replace references with ExternalIssue

This MR Removes unused JiraIssue class and replaces references with ExternalIssue

Closes #18203 

See merge request !4659
2016-06-17 00:24:10 +00:00
Robert Speicher c34d74090d Merge branch 'add_autocomplete_for_labels' into 'master'
Add GFM autocomplete for labels

Closes #14637 

See merge request !4013
2016-06-17 00:22:01 +00:00
Robert Speicher 6300936b67 Merge branch 'fix-project-find-with-namespace-order' into 'master'
Fixed ordering in Project.find_with_namespace

This MR fixes the ordering of `Project.find_with_namespace` to ensure that it returns rows that match literally first.

Closes #18603

See merge request !4682
2016-06-17 00:18:10 +00:00
Robert Speicher 88c7b7ae96 Merge branch 'bump-gitlab-git-10.2.0' into 'master'
Use gitlab-git 10.2.0

Closes #18741

See merge request !4722
2016-06-17 00:14:01 +00:00
Robert Speicher f63bc8222d Center the header logo for all Devise emails 2016-06-16 20:10:52 -04:00
Robert Speicher 7b66dcf65e Add previews for all customized Devise emails 2016-06-16 20:10:52 -04:00
Robert Speicher 933cd3478d Customize the Devise unlock_instructions email 2016-06-16 20:10:52 -04:00
Robert Speicher 3a5315d3ce Customize the Devise reset_password_instructions email 2016-06-16 20:10:52 -04:00
Robert Speicher dd1f56b5c4 Customize the Devise password_change emails 2016-06-16 20:10:52 -04:00
Stan Hu 91253a3afd Use gitlab-git 10.2.0 2016-06-16 15:56:39 -07:00
Douwe Maan 84632f0aff Merge branch 'banzai-issue-filter-queries' into 'master'
Reduce SQL query counts in IssueReferenceFilter

## What does this MR do?

This MR adds a preparation phase for reference filters that allows them to prepare/create data structures used while iterating over HTML nodes. In this particular case the preparation phase is used for issue references to greatly cut down the amount of queries executed to get projects/issues for Markdown references.

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

No.

## Why was this MR needed?

Rendering Markdown containing issue references would run at most two queries for every issue reference: one to get the project and one to get the issue from said project. When rendering Markdown with lots of issue references this would result in _a lot_ of queries being executed.

## What are the relevant issue numbers?

#18042

See merge request !4410
2016-06-16 20:49:13 +00:00
Jacob Schatz 0de4462468 Merge branch 'tree-file-title' into 'master'
Added title attribute to entries in tree view

## What does this MR do?

Adds a title attribute to entries in the tree view. Moe useful when files have long names.

## What are the relevant issue numbers?

Closes #18353 


See merge request !4709
2016-06-16 20:26:52 +00:00
Jacob Schatz e0f46ef1a5 Merge branch 'merge-request-default-source-branch-text' into 'master'
Added source branch text to dropdown toggle

## What does this MR do?

Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch"

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_12.20.10](/uploads/40d31e21297a99300050cf9f23bd7371/Screen_Shot_2016-06-07_at_12.20.10.png)

See merge request !4504
2016-06-16 19:29:28 +00: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
Phil Hughes 537e8f2105 Added title attribute to enties in tree view
Closes #18353
2016-06-16 13:58:00 +01: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
Yorick Peterse 19a290e7bf Reduce queries in IssueReferenceFilter
This reduces the number of queries executed in IssueReferenceFilter by
retrieving the various projects/issues that may be referenced in batches
_before_ iterating over all the HTML nodes.

A chunk of the logic resides in AbstractReferenceFilter so it can be
re-used by other filters in the future.
2016-06-16 14:04:45 +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 4259878615 Fixed ordering in Project.find_with_namespace
This ensures that Project.find_with_namespace returns a row matching
literally as the first value, instead of returning a random value.

The ordering here is _only_ applied to Project.find_with_namespace and
_not_ Project.where_paths_in as currently there's no code that requires
Project.where_paths_in to return rows in a certain order. Since this
method also returns all rows that match there's no real harm in not
setting a specific order either. Another reason is that generating all
the "WHEN" arms for multiple values in Project.where_paths_in becomes
really messy.

On MySQL we have to use the "BINARY" operator to turn a "WHERE" into a
case-sensitive WHERE as otherwise MySQL may still end up returning rows
in an unpredictable order.

Fixes gitlab-org/gitlab-ce#18603
2016-06-16 13:04:59 +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
Phil Hughes cd37c927e1 CHANGELOG
[ci skip]
2016-06-16 08:43:10 +01:00
Phil Hughes 7708d5a93d CHANGELOG
[ci skip]
2016-06-16 08:42:35 +01:00
Phil Hughes da592a737c Added source branch text to dropdown toggle
Previously, the dropdown toggle would default to "Select source branch",
this changes that so that it defaults to the branch name and if that
doesn't exist, it defaults to "Select source branch"
2016-06-16 08:42:35 +01: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
Robert Speicher 6e05270b6c Merge branch 'confidential-issue-notes' into 'master'
Project members with guest role can't access notes on confidential issues

Related issues:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/18535
- https://gitlab.com/gitlab-org/gitlab-ce/issues/14787

See merge request !1971
2016-06-16 02:44:32 +00:00