Commit Graph
29750 Commits
Author SHA1 Message Date
Felipe Artur dc2ca59433 Expose notification setting events in API 2016-06-13 15:51:11 -03:00
Felipe Artur e60999ec5c Improve notification settings event keys and add some specs 2016-06-13 15:51:11 -03:00
Felipe Artur 2979d3ca1b Implement custom notification level options 2016-06-13 15:51:11 -03:00
Dmitriy Zaporozhets 6aefd3c321 Merge branch 'dz-cleanup-counters' into 'master'
Remove counters from Pipeline navigation

* counters are heavy from UI perspective
* duplicates information from tabs below
* shows 0 for less active projects. Jumps from 0 to N constantly. 

I think we should render counters only when necessary and only for filters ( tabs on white bg ).  Exception:  issues, merge requests in top navigation as status of project popularity and action required from maintainers 


cc @grzesiek @ayufan @jschatz1 

See merge request !4617
2016-06-13 18:18:20 +00:00
Douwe Maan 1cbd5c6686 Merge branch 'gitlab-auth-method-names' into 'master'
Improve Gitlab::Auth method names

Auth.find was a very generic name for a very specific method.
Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also
looks in Kerberos.


See merge request !4589
2016-06-13 18:05:53 +00:00
Robert Speicher 04e4077673 Merge branch 'style/enable-multiline-block-chain-rubocop-cop' into 'master'
Enable Style/MultilineBlockChain rubocop style cop

Avoid multi-line chains of blocks.

See #17478.

See merge request !4349
2016-06-13 18:04:41 +00:00
Robert Speicher 1c34ee5b7a Merge branch 'upgrade-brakeman' into 'master'
Update brakeman from 3.2.1 to 3.3.2

Removes a few dependencies.

Changelog: https://github.com/presidentbeef/brakeman/blob/master/CHANGES

See merge request !4627
2016-06-13 17:30:53 +00:00
Kamil Trzciński c928accd95 Merge branch 'fix-related-branches-error-500' into 'master'
Fix typo causing related branches to Error 500

From Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/6154/

See merge request !4611
2016-06-13 16:22:38 +00:00
Jacob Schatz 70672182d1 Merge branch 'fix-bulk-assign-labels' into 'master'
Fixes bulk-assign label for multiple issues not having the same labels

## What does this MR do?
Fixes a bug when bulk-assigning a label to multiple issues while the label is present in on the issues on the selection.

## Screenshots (if relevant)

**Before Bugfix**

<img src="/uploads/ad1f290bcf3930177a3a71c69cbe5325/before-bugfix.gif" width="700"/>

**After Bugfix**

<img src="/uploads/1f04d6bf027806fb13ca3773febda744/bugfix.gif" width="700"/>

## Does this MR meet the acceptance criteria?

- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)

See merge request !4602
2016-06-13 15:57:38 +00:00
Rémy Coutable 9fdadfc065 Merge branch 'artifacts-when' into 'master'
Added when to artifacts

The syntax for this will be:

```
job:
  artifacts:
    when: on_failure
```

cc @grzesiek @tmaczukin 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4034


See merge request !4201
2016-06-13 14:58:02 +00:00
Kamil Trzcinski 0fab7b11ba Merge remote-tracking branch 'origin/master' into artifacts-when 2016-06-13 16:05:43 +02:00
Rémy Coutable 57ebd3996e Merge branch 'cache-apt-and-ruby-only' into 'master'
Cache only apt and ruby from vendor

## What does this MR do?

Optimises caching mechanism when testing gitlab-ce/ee repositories.


See merge request !4619
2016-06-13 13:56:18 +00:00
Rémy Coutable b080d88a6b Merge branch 'instrument-reference-parsers' into 'master'
Instrument all Banzai::ReferenceParser classes

## What does this MR do?

This MR instruments all the classes in the `Banzai::ReferenceParser` namespace.

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

No.

## Why was this MR needed?

The classes in question weren't instrumented meaning we have no idea how they're performing in production.

## 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
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- [ ] ~~Tests~~
- [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 !4620
2016-06-13 13:49:40 +00:00
Jacob Vosmaer f73cf3e937 Also rename "find" in the specs 2016-06-13 15:38:25 +02:00
Achilleas Pipinellis aa48eeef17 Merge branch 'doc-styleguide-move-locations' into 'master'
Add guide on changing a document's location

## What does this MR do?

Add a documentation styleguide when changing a document's location.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/3349


See merge request !4624
2016-06-13 13:26:43 +00:00
Achilleas Pipinellis e5b974bda7 Merge branch 'fix-notes-doc-styleguide' into 'master'
Change to new Notes styleguide



See merge request !4625
2016-06-13 13:08:56 +00:00
Achilleas Pipinellis cb7fa10cb5 Change to new Notes styleguide
[ci skip]
2016-06-13 15:04:22 +02:00
Achilleas Pipinellis d1abbb3b66 Add guide on changing a document's location
[ci skip]
2016-06-13 15:00:28 +02:00
Rémy Coutable c0e415e488 Merge branch 'fix-migration-helper-race-conditions' into 'master'
Fix migration helper race conditions

## What does this MR do?

This MR fixes two problems with the migration helpers:

1. An error in `change_column_null` would not drop the previously created column
2. `update_column_in_batches` would rely on the number of rows in a table to determine how many to update. This meant that newly inserted rows (after the `COUNT`) would not be taken into account.

This MR also removes an outdated comment for `update_column_in_batches`.

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

No.

## Why was this MR needed?

See above.

## What are the relevant issue numbers?

Fixes #18483

## 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
  - [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 !4618
2016-06-13 12:50:39 +00:00
Rémy Coutable dc38551b93 Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master'
Only show branches for revert / cherry-pick

## What does this MR do?

Stop showing tags in the revert and cherry-pick select options. You can't change a tag anyway.

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

Uncertain.

## Why was this MR needed?

Showing tags doesn't make any sense and will just throw an exception if the user tries to cherry-pick or revert onto a tag.

## What are the relevant issue numbers?

Fixes #18377.

## Screenshots (if relevant)

On the GitLab CE repo:

![image](/uploads/9c5a6f09300a7c46d0a794bef2956992/image.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
  - [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 !4596
2016-06-13 12:46:29 +00:00
Achilleas Pipinellis e8ebc1b637 Merge branch 'move-logs-doc-to-administration' into 'master'
Change logs.md location in README

## What does this MR do?

Forgotten link from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4622

See merge request !4623
2016-06-13 12:24:01 +00:00
Achilleas Pipinellis 0587fe7256 Merge branch 'move-logs-doc-to-administration' into 'master'
Move logs/logs.md to administration/logs.md

## What does this MR do?

Move `logs.md` documentation under `administration/` where it fits better.

## Why was this MR needed?

For a better doc structure.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/3349

See merge request !4622
2016-06-13 12:19:53 +00:00
Achilleas Pipinellis e489e9a585 Change logs.md location in README
[ci skip]
2016-06-13 14:19:29 +02:00
Douwe Maan c03f125904 Merge branch 'issue_3359_2' into 'master'
Remove notification level from user model

part of #3359 

See merge request !4494
2016-06-13 11:52:39 +00:00
Achilleas Pipinellis 35e9fc9865 Move logs/logs.md to administration/logs.md
[ci skip]
2016-06-13 13:52:20 +02:00
Kamil Trzcinski bb3fc8c72c Make "four phase test" 2016-06-13 12:07:03 +02:00
Sean McGivern b997752539 Only show branches for revert / cherry-pick
Tags are immutable, so we can't add a commit to either revert or
cherry-pick another commit to them.
2016-06-13 11:05:22 +01:00
Yorick Peterse ffd316483c Instrument all Banzai::ReferenceParser classes
Now that this code is no longer part of Banzai::Filter it needs to be
instrumented explicitly.
2016-06-13 12:03:25 +02:00
Yorick Peterse ea7ff13410 Removed old comment from update_column_in_batches 2016-06-13 11:50:27 +02:00
Yorick Peterse 9c238dc970 Update columns in batches until no rows are left
Instead of updating a fixed number of rows (based on the amount of rows
available at the start of the update) the method
"update_column_in_batches" will now continue updating rows until it runs
out of rows to process.

For a table with a high rate of inserts this may result in the migration
taking quite some time. However, the alternative is not all rows being
updated or the "change_column_null" method raising an error due to there
being NULL values.
2016-06-13 11:38:57 +02:00
Dmitriy Zaporozhets 0e50fa24a5 Remove counters from Pipeline navigation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-13 12:32:53 +03:00
Yorick Peterse b33b7be53e Handle NULL migration errors in migration helpers
This ensures that whenever changing the NULL constraint of a column
fails we still drop the column.
2016-06-13 11:22:58 +02:00
Rémy Coutable 65df6bcb89 Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twice' into 'master'
Resolve ""When this merge request is accepted, this issue will be closed automatically" rendered twice"

## What does this MR do?

1. Only show the above text when there is an MR that will close the issue, and even then, only show it once.
2. Apply 98f147e84d2bd8f2278452ac0852118452c76d4a to a bunch of other places that need it.

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

¯\_(ツ)_/¯

## Why was this MR needed?

Some pages were broken.

## What are the relevant issue numbers?

Fixes #18446.

## Screenshots (if relevant)

Before:
![image](/uploads/23cfaf95b7c798f22963ff67f78a803b/image.png)

After:
![image](/uploads/ca9c538069ba52e53858c69387738521/image.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
- [ ] 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 !4594
2016-06-13 08:47:10 +00:00
Robert Speicher 06a99cf7ea Merge branch 'bug/svg_sanitizer' into 'master'
Improve SVG sanitizer to handle namespaced attributes

* Small refactor in the SVG sanitizer
* Enable already whitelisted namespaced attributes to be allowed
* Disable `xlink:href`to reference any external resource

Fixes #18100 

See merge request !4427
2016-06-13 03:25:01 +00:00
Stan Hu c1f37964ed Fix typo causing related branches to Error 500 2016-06-12 19:29:58 -07:00
Gabriel MazettoandRobert Speicher 7c87dac5f1 Improved SVG sanitizer specs to include smoke tests for clean. 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher a9eaa20dcb Refactored SVG sanitizer 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher 388f6eaaa6 Added SVG sanitizer fix to the changelog 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher 13791c6704 Refactor SVG sanitizer and prevent xlink:href to refer to external resources 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher 02b882418a Fix SVG whitelisting to allow namespaced attributes 2016-06-12 21:05:57 -04:00
Connor Shea f395ed242a Update brakeman from 3.2.1 to 3.3.2
Removes a few dependencies.

Changelog: https://github.com/presidentbeef/brakeman/blob/master/CHANGES
2016-06-12 18:25:21 -06:00
Kamil Trzcinski b43c6c43b4 Cache only apt and ruby from vendor
Since introduction of gitignore the vendor folder contains also gitignores which affects detection when to update a cache.
We explicitly cache only apt and ruby folders.
2016-06-12 23:05:19 +02:00
Robert Speicher 8d243f9bda Merge branch 'fix-closes-issues-error-500' into 'master'
Fix Error 500 when using closes_issues API with an external issue tracker

Closes #18484

See merge request !4608
2016-06-12 19:26:29 +00:00
Stan Hu a85dde9182 Fix Error 500 when using closes_issues API with an external issue tracker
Closes #18484
2016-06-11 19:50:08 -07:00
Dmitriy Zaporozhets 714a60b45c Merge branch 'nav-offscreen-dz-patch' into 'master'
Improvements to offscreen navigation

Improvements on top of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4579 based on mockups from https://gitlab.com/gitlab-org/gitlab-ce/issues/18417#note_12389766

See merge request !4607
2016-06-11 09:25:35 +00:00
Dmitriy Zaporozhets f3cbd4bbb6 Merge branch '18417-nav-offscreen' into 'master'
Resolve "Hide Left sidebar paradigm"

## What does this MR do?
Hides the nav bar by default & centers the tanuki logo in the top nav

## Why was this MR needed?
UX

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

## Screenshots (if relevant)
![Screen_Shot_2016-06-10_at_12.49.10_PM](/uploads/c281e4c9de1c1bc9af59ebfa8d2bd18b/Screen_Shot_2016-06-10_at_12.49.10_PM.png)
![Screen_Shot_2016-06-10_at_12.49.27_PM](/uploads/635e0a88230105faa5527f6632899ddb/Screen_Shot_2016-06-10_at_12.49.27_PM.png)
<img src="/uploads/3001a9c723037012f1b86cfacfb1225e/Screen_Shot_2016-06-10_at_12.51.41_PM.png" width="500px">

See merge request !4579
2016-06-11 08:43:21 +00:00
Dmitriy Zaporozhets a46b4f11d5 Center layout navigation and remove icons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-11 11:30:53 +03:00
Dmitriy Zaporozhets 0cdfa8a916 Merge branch '18463-search-form-padding-is-too-damn-high' into 'master'
Fixed search form padding

## What does this MR do?

Corrects the padding of the search form.

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

## Screenshots (if relevant)

![Screen_Shot_2016-06-10_at_14.07.32](/uploads/e4d127c66cf7fa3286279367d6e4ea7c/Screen_Shot_2016-06-10_at_14.07.32.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 !4591
2016-06-11 07:44:32 +00:00
Alfredo Sumaran 952660d2cf Fixes a bug when assigning a label to multiple issues
Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
2016-06-10 23:55:50 -05:00
Robert Speicher ff345f8ba1 Merge branch 'create-backup-dir-for-local' into 'master'
Only create the backup directory if it is local

Closes #12710

See merge request !4551
2016-06-10 20:08:23 +00:00