Commit Graph
15538 Commits
Author SHA1 Message Date
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
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 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
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
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
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
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
Stan Hu c1f37964ed Fix typo causing related branches to Error 500 2016-06-12 19:29:58 -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
Annabel Dunstone 3e28d04cce Fix preferences_spec test 2016-06-10 15:08:13 -05:00
Annabel Dunstone 630aeb31eb Add back sidebar counters and username 2016-06-10 12:39:58 -05:00
Robert Speicher b4e84809e8 Merge branch 'finding-multiple-projects-by-paths' into 'master'
Add Project.where_paths_in

In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4410 I'm working on reducing the SQL queries needed to render Markdown. One reason for the large amount of queries is executing a large number of queries needed to find projects and related data. Basically `Project.find_with_namespace` is called in a loop and then any relations have to be retrieved separately.

By using `Project.where_paths_in` we can work around this by doing something like:

```ruby
project_paths = [...] # populated by some method
projects = Project.where_paths_in(project_paths).includes(:namespace, ...)
```

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/18042

See merge request !4535
2016-06-10 17:17:19 +00:00
Robert Speicher ed87e6c680 Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' into 'master'
Remove unused MergeRequest#gitlab_merge_status method

Closes #18462.

See merge request !4593
2016-06-10 17:04:53 +00:00
Annabel Dunstone 67a18f34e9 Fix safari logo loading animation safari bug 2016-06-10 12:01:51 -05:00
Annabel Dunstone cb126995aa Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container 2016-06-10 12:01:51 -05:00
Annabel Dunstone 9662a5e3df Update media queries 2016-06-10 12:01:51 -05:00
Annabel Dunstone 5957fdc493 Fix profile test 2016-06-10 12:01:51 -05:00
Annabel Dunstone ade0a4af8b Fix logo at all screen widths, update sidebar text 2016-06-10 12:01:51 -05:00
Annabel Dunstone a1fbdbb6b1 Move tanuki icon to center of nav bar; keep nav closed by default; remove collapsed nav cookie 2016-06-10 12:01:51 -05:00
Dmitriy Zaporozhets 8f3c0490dd Merge branch 'labels-placement' into 'master'
Move Labels and Milestones as sub tab to Issues/MR

## What does this MR do?

UI/UX change. Moves project labels and milestone tabs under Issues and Merge request tabs. 

## Why was this MR needed?

To solve problem of having to many tabs in top navigation. Since Labels and Milestones depends on Issue/MR feature it belongs to it and can be removed from top nav.

## What are the relevant issue numbers?

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

## 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) - not needed
- [x] API support added - not needed
- [x] Tests
  - [x] Added for this feature/bug - changed existing tests to match new behaviour
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)

cc @jschatz1 @annabeldunstone @skyruler

See merge request !4592
2016-06-10 16:57:13 +00:00
Rémy Coutable a1db70770e Remove unused MergeRequest#gitlab_merge_status method
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 18:42:03 +02:00
Robert Speicher 37be2007f9 Merge branch 'workhorse-helpers' into 'master'
Add workhorse controller and API helpers

Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with.

See merge request !4486
2016-06-10 16:21:26 +00:00
Dmitriy Zaporozhets 95f15b14d1 Render issues link on issues subnav unless you visit merge request controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10 19:15:23 +03:00
Dmitriy Zaporozhets d4b2f5d0f3 Render only issues/mr in subnav depends on context
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10 19:15:23 +03:00
Dmitriy Zaporozhets 1976a44649 Move Labels and Milestones as sub tab to Issues/MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10 19:15:23 +03:00
Luke "Jared" Bennett 483e4571a6 Fixed search form padding
Updated CHANGELOG

Removed CHANGELOG entry
2016-06-10 16:49:04 +01:00
Jacob Schatz d6de816982 Merge branch 'ci-page-ui-update' into 'master'
CI build page UI update

Closes #2569 

See merge request !3829
2016-06-10 15:44:21 +00:00
Jacob Schatz bedb711453 Merge branch 'icon-color-fix' into 'master'
Update activity SVG path

## What does this MR do?
Fixes SVG path so the activity icon is the correct color

## Screenshots (if relevant)
<img src="/uploads/ea948338ea816890851a8011b8b3255f/Screen_Shot_2016-06-09_at_8.43.05_AM.png" width="600px">


See merge request !4563
2016-06-10 15:39:13 +00:00
Jacob Schatz 0adc6d1bc0 Merge branch 'prettier-awardable-button-active' into 'master'
Made the awardable buttons prettier when active

## What does this MR do?

Made the active and hover state of the award emoji buttons prettier.

## Why was this MR needed?

'cause @JobV wanted them to look nicer 😉 

## What are the relevant issue numbers?

Closes #18379 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.10.44](/uploads/5ecd0f12679e3484de1ab1d2dbe50cd8/Screen_Shot_2016-06-09_at_09.10.44.png)

See merge request !4554
2016-06-10 15:38:52 +00:00
Jacob Schatz c7eecb4a20 Merge branch 'label-create-error-messages' into 'master'
Correctly shows label errors in dropdown

## What does this MR do?

Correctly shows any errors in the dropdown when creating a new label

## What are the relevant issue numbers?

Closes #18344 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png)

See merge request !4553
2016-06-10 15:38:32 +00:00
Jacob Schatz e99559260b Merge branch 'user-search-dropdown' into 'master'
Revert change to search all users

## What does this MR do?

Reverts a change that allowed the user to search for all users in the author/assignee dropdown

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

Double check it isn't still searching all users

See merge request !4564
2016-06-10 15:30:28 +00:00
Jacob Schatz 2e7e2b5349 Merge branch 'project-dropdown-position-fix' into 'master'
Fixed project dropdown being overlapped by sidebar

## What does this MR do?

Changes the header expanded `padding` to `margin` to prevent the project dropdown from overlapping.

## What are the relevant issue numbers?

Closes #18410 

## Screenshots (if relevant)

![Screen_Shot_2016-06-10_at_10.38.00](/uploads/b569d6d4cbd126fd776cf849ebc1137d/Screen_Shot_2016-06-10_at_10.38.00.png)

See merge request !4583
2016-06-10 15:29:40 +00:00
Jacob Schatz 7aa6768812 Merge branch 'label-filter-fix' into 'master'
Fixed issue where label filtering didnt work

## What does this MR do?

The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that.

## What are the relevant issue numbers?

Closes #18375 

See merge request !4556
2016-06-10 15:23:39 +00:00
Felipe Artur 39ead205de Remove notification level fild from users, improve migrations and specs 2016-06-10 11:49:30 -03:00
Rémy Coutable 133d5c1c64 Merge branch 'rename-ci-commit-phase-4' into 'master'
Rename Commit to Pipeline in TriggerRequest

Changes in TriggerRequest a `commit` to `pipeline`.


See merge request !4505
2016-06-10 14:31:21 +00:00
Felipe Artur 8f6d43e0fe Remove notification level from user model 2016-06-10 10:58:13 -03:00
Paco GuzmanandYorick Peterse 136a4ea39b Cache the presence of an issue_tracker at project level
Using update_column to store the boolean flag to avoid
any side effects with the current state of the project
instance
2016-06-10 15:41:56 +02:00
Yorick Peterse 24920bc52a Add Project.where_paths_in
This method can be used to find multiple projects for multiple paths.
For example, take this snippet:

    Project.where_paths_in(%w{gitlab-org/gitlab-ce gitlab-org/gitlab-ee})

This will return an ActiveRecord::Relation containing the GitLab CE and
GitLab EE projects.

This method takes care of matching rows both case-sensitively and
case-insensitively where needed.

Project.find_with_namespace in turn has been modified to use
Project.where_paths_in without nuking any scoping (instead it uses
reorder(nil)). This means that any default scopes (e.g. those used for
"pending_delete" stay intact).

The method Project.where_paths_in was added so the various Markdown
filters can use a single query to grab all the projects referenced in a
set of documents, something Project.find_with_namespace didn't allow.
2016-06-10 15:33:05 +02:00
Sean McGivern c7941acd1e Don't try to count a relation with aliases
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML,
but not MRs or Atom feeds.
2016-06-10 14:29:08 +01:00
Sean McGivern 49c06ba391 Only show issues closing MR when present 2016-06-10 14:17:10 +01:00
Rémy Coutable f29fd65cdd Merge branch 'fix/incremental-trace-update-api' into 'master'
Fix UTF-8 handling in incremental trace update API

## What does this MR do?

This MR fixes invalid UTF-8 handling in incremental trace update API (used by GitLab Runner).

## Why was this MR needed?

Current version is using `.length` method to determine current trace size where Runner is using the trace size in bytes. Also this byte size is used in headers and file operations to agree the trace part to send. This is a problem when build trace contains any multi-byte UTF-8 characters. This MR is fixing this situation so all parts are using the same size in bytes.

### Runner -> API communication before fix:
```
Checking for builds... received                     runner=_token_
gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9)  build=25 runner=_token_
Using Docker executor with image debian:jessie ...  build=25 runner=_token_
Pulling docker image debian:jessie ...              build=25 runner=_token_
25 Submitting build to coordinator... ok            runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-491 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_
WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-491 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=505-584 runner=_token_
WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-556 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=491-584 runner=_token_
WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-556 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=584-663 runner=_token_
WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-621 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=556-663 runner=_token_
Build succeeded                                     build=25 runner=_token_
WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-621 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=663-797 runner=_token_
WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-741 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=621-797 runner=_token_
25 Submitting build to coordinator... ok            runner=_token_
```

### Runner -> API communication after fix:
```
Checking for builds... received                     runner=_token_
gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9)  build=26 runner=_token_
Using Docker executor with image debian:jessie ...  build=26 runner=_token_
Pulling docker image debian:jessie ...              build=26 runner=_token_
26 Submitting build to coordinator... ok            runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-505 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-584 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=505-584 runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-663 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=584-663 runner=_token_
Build succeeded                                     build=26 runner=_token_
26 Submitting build to coordinator... ok            runner=_token_
```

See merge request !4541
2016-06-10 13:08:22 +00:00
Jacob Vosmaer 0e896ffe4e 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.
2016-06-10 14:51:16 +02:00