Commit Graph
25431 Commits
Author SHA1 Message Date
Douwe MaanandRémy Coutable 48c8fd9113 Merge branch 'add-tooltip-to-issue-new-branch-button-with-create-branch-issue-title-123-14565' into 'master'
Add tooltip to new branch button

Closes #14565

See merge request !3380
2016-03-29 12:19:53 +02:00
Douwe MaanandRémy Coutable 30030141f6 Merge branch 'fix-comments-on-confidential-issues-show-activity-feed-for-non-members' into 'master'
Comments on confidential issues doesn't show in activity feed to non-members

Closes #14568

See merge request !3375
2016-03-29 12:18:51 +02:00
Robert SpeicherandRémy Coutable 62600ec391 Merge branch 'fix-milestone-upcoming' into 'master'
Fix Milestone.upcoming

The order wasn't happening because of `default_scope`. Blegh.

See merge request !3364
2016-03-29 12:18:10 +02:00
Robert SpeicherandRémy Coutable 5f9595bbd5 Merge branch 'fix-application-settings' into 'master'
Fixed error with applications delete anonymous token form

Closes #14509

See merge request !3362
2016-03-29 12:16:04 +02:00
Jacob SchatzandRémy Coutable 062b806df0 Merge branch 'sidebar-bold-fix' into 'master'
Fixed bold in sidebar

![Screen_Shot_2016-03-23_at_12.01.54](/uploads/d50ae3426efcb2436b3debdd80073b2f/Screen_Shot_2016-03-23_at_12.01.54.png)

This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289

See merge request !3358
2016-03-29 12:13:46 +02:00
Jacob SchatzandRémy Coutable 9612e57593 Merge branch 'dropdown-alignment-fixes' into 'master'
Dropdown pixel perfect 🎉

Closes #14333, #14331, #14472, #14515

See merge request !3337
2016-03-29 12:12:40 +02:00
Jacob SchatzandRémy Coutable 329fd857b0 Merge branch 'issue-sidebar-overlap' into 'master'
Issue sidebar overlaps on tablet

Closes #14180

![Screen_Shot_2016-03-18_at_13.10.53](/uploads/d1e81778740a034aa98c881a70e55254/Screen_Shot_2016-03-18_at_13.10.53.png)

See merge request !3299
2016-03-29 12:11:09 +02:00
Jacob SchatzandRémy Coutable 9dc8f3d40c Merge branch 'dropdown-right-align' into 'master'
Dropdown alignment

Hopefully the JS will stop this happening in future as well!

Closes #14386

![Screen_Shot_2016-03-18_at_12.54.32](/uploads/d11b51d3577df3a19b8b3a0fd7b69788/Screen_Shot_2016-03-18_at_12.54.32.png)

See merge request !3298
2016-03-29 12:10:11 +02:00
Rémy Coutable a96d737bad Version 8.6.1 v8.6.1 2016-03-23 13:36:40 +01:00
Rémy Coutable fa4a3d24b6 Remove "(unreleased)" from the CHANGELOG
[ci skip]
2016-03-23 13:12:39 +01:00
Rémy Coutable f45b9bdef0 Merge branch 'fix-build-dependencies' into 'master'
Fix build dependencies, when the dependency is a string

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

See merge request !3344
2016-03-23 12:59:29 +01:00
Douwe MaanandRémy Coutable 83961f9790 Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master'
Fix sorting issues/mrs by votes on the groups page

Closes #14394

The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.

```ruby
Issue.reorder(created_at: :desc).joins(:project).to_sql
=> "SELECT issues.*
    FROM issues INNER JOIN projects ON projects.id = issues.project_id
    ORDER BY issues.created_at DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql
=> "SELECT issues.*
    FROM issues INNER JOIN projects ON projects.id = issues.project_id
    WHERE projects.archived = 'f'
    ORDER BY projects.id DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql
=> "SELECT issues.*
    FROM issues INNER JOIN projects ON projects.id = issues.project_id
    WHERE projects.archived = 'f'
    ORDER BY issues.created_at DESC"
```

/cc @yorickpeterse

See merge request !3333
2016-03-23 12:49:04 +01:00
Rémy Coutable e257e81cbf Merge branch 'fix/14505' into 'master'
Fix an issue causing the Dashboard/Milestones page to be blank

Fixes #14505 and #14514.

See merge request !3348
2016-03-23 12:48:08 +01:00
Jacob SchatzandRémy Coutable e1f999a2ca Merge branch 'merge-request-sidebar' into 'master'
Fixed bug where participants would not work correctly on merge requests

Also fixed alignment bug with can't merge badge

Closes #14478, #14494

See merge request !3329
2016-03-23 12:35:08 +01:00
Jacob SchatzandRémy Coutable 6ba230ea3d Merge branch 'issue_13885' into 'master'
Display nav controls on mobile

Set inputs inside .nav-controls to full-width on viewports below 600px

Fixes #13885

**Affected pages**

/dashboard/groups

/admin/builds

/dashboard/projects

/dashboard/issues

/dashboard/merge_requests

/dashboard/milestones

/dashboard/todos

/explore

/groups/{group-name}/issues

/groups/{group-name}

/groups/{group-name}/milestones

/{group-name}/{project-name}/builds

/{group-name}/{project-name}/forks

/{group-name}/{project-name}/issues

/{group-name}/{project-name}/labels

/{group-name}/{project-name}/merge_requests

/{group-name}/{project-name}/milestones

/{group-name}/{project-name}/wikis/home

/{group-name}/{project-name}/wikis/pages

Some Screenshots

**Groups**

![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png)

**Admin > Builds**

![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png)

**TODOs**

![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png)

**Dashboard > Projects**

![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png)

**Project Issues**

![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png)

**Project Merge Requests**

![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png)

See merge request !3214
2016-03-23 12:34:32 +01:00
Jacob SchatzandRémy Coutable e5abd96c33 Merge branch 'fix-milestone-assign' into 'master'
Fixes issue with assign milestone not loading milestone list

cc. @jschatz1

See merge request !3346
2016-03-23 12:32:20 +01:00
Jacob SchatzandRémy Coutable 0585619903 Merge branch 'label-dropdown-errors' into 'master'
Shows error messages when trying to create label in dropdown menu

Closes #14495

![Screen_Shot_2016-03-22_at_14.46.10](/uploads/cdcaa51f4d41237f8027efbd0f894bcd/Screen_Shot_2016-03-22_at_14.46.10.png)

See merge request !3345
2016-03-23 12:31:29 +01:00
Douwe MaanandRémy Coutable 0af8309eff Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into 'master'
User has to confirm deletion of issuables

Closes #14474

See merge request !3341
2016-03-23 12:30:35 +01:00
Douwe MaanandRémy Coutable ae407262f2 Merge branch 'move-issue-section-should-not-be-displayed-in-the-new-issue-form-14489' into 'master'
Moving of issuables only when the record already exists

Closes #14489

See merge request !3340
2016-03-23 12:29:41 +01:00
Jacob SchatzandRémy Coutable 0223a2de92 Merge branch 'auto-collapse-nav' into 'master'
Auto collapses the navigation when resizing

Closes #14475

![auto-collapse](/uploads/332c6261acb6bc30d7d30cbdfafe92eb/auto-collapse.gif)

See merge request !3343
2016-03-23 12:28:12 +01:00
Jacob SchatzandRémy Coutable 5a20d3ab51 Merge branch 'header-mobile-overflow' into 'master'
Fixes issue with signin button overflowing on mobile

Closes #14477

![Screen_Shot_2016-03-22_at_13.52.51](/uploads/7c9b2c38be7d497c690a7d17ae0ca76d/Screen_Shot_2016-03-22_at_13.52.51.png)

![Screen_Shot_2016-03-22_at_13.52.43](/uploads/8b2432aeb4afec455286fced11c5490c/Screen_Shot_2016-03-22_at_13.52.43.png)

See merge request !3342
2016-03-23 12:27:33 +01:00
Douwe MaanandRémy Coutable 3536b17e97 Merge branch 'notifications-for-subscribers-confidential-issue-labels' into 'master'
Restrict notifications for confidential issues

Closes #14468

/cc @rymai

See merge request !3334
2016-03-23 12:26:56 +01:00
Robert SpeicherandRémy Coutable 3129e135eb Merge branch 'drop_db_before_restore' into 'master'
Reload the schema before restoring a database backup

If a user tries to downgrade and restore after a failed upgrade,
the database may still contain newer tables. Reload the older
schema before restoring the database to avoid future upgrade
problems. Also, add a rake task to help users add migration
versions to the database so it's easier to recover from these
errors if they do occur. Fixes #13419

See merge request !2807
2016-03-23 12:25:06 +01:00
Rémy Coutable a5dc73f16f Add missing changelog item and add 8.6.1
[ci skip]
2016-03-22 15:37:59 +01:00
Rémy Coutable 3192db7071 Version 8.6.0 v8.6.0 2016-03-22 13:23:56 +01:00
Achilleas PipinellisandRémy Coutable 382dead4b8 Merge branch 'doc_group_visibility' into 'master'
Add docs on group visibility

Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323

See merge request !3338
2016-03-22 12:37:34 +01:00
Achilleas PipinellisandRémy Coutable cb77958b67 Merge branch 'gitlab_intro_docs' into 'master'
GitLab intro docs

Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1

---

Need refactor:

- Create a new project
- Create a new group
- Create a new issue
- Assign labels to issues
- Use milestones as an overview of your project's tracker
- Fork a project and contribute to it
- Create a new merge request
- Automatically close issues from merge requests (include GitLab.com pattern)
- GitLab CI quick start guide (make it easier to follow)

Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068

See merge request !3225
2016-03-22 12:36:53 +01:00
Douwe MaanandRémy Coutable d0a7dfd66d Merge branch '2489-soft-delete-issues' into 'master'
Soft delete issuables

Fixes #2489 

What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime.

TODO: 
- [x] Also group owners can ***soft*** delete
- [x] Button should be hidden

See merge request !2982
2016-03-22 12:36:02 +01:00
Douwe MaanandRémy Coutable 4999495705 Merge branch 'fix/safe-import-url' into 'master'
Prevent tokens in the import URL to be showed by the UI

Quick fix to prevent the import URL to show a user's token.

See merge request !3331
2016-03-22 12:34:38 +01:00
Kamil TrzcińskiandRémy Coutable 0fcea6b660 Merge branch 'feature-ci-only-except-trigger' into 'master'
CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run

Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic:

- If the repository is tagged, do a build.
- Any other normal commits should not cause a build.
- If a build is triggered via the API, always create one for the specified ref.

From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration:

```yaml
only:
  - tags
  - triggers
```

I updated the tests and documentation to reflect this and everything seems to pass.

See merge request !3230
2016-03-22 12:34:20 +01:00
Jacob SchatzandRémy Coutable 9684d7fd99 Merge branch 'css-indentation' into 'master'
Fix Indentation lints in CSS.

As discussed in #14299.

cc: @jschatz1 

See merge request !3312
2016-03-22 12:34:01 +01:00
Jacob SchatzandRémy Coutable 067539807d Merge branch 'ssh-page-ago' into 'master'
Remove duplicated ago

Closes #14460 

See merge request !3332
2016-03-22 12:33:42 +01:00
Jacob SchatzandRémy Coutable 6ecabcbe95 Merge branch 'project-icon' into 'master'
Changing project icon

Closes #14196

See merge request !3268
2016-03-22 12:33:28 +01:00
Jacob SchatzandRémy Coutable 6e46c56b12 Merge branch 'css-shorthand' into 'master'
Follow the CSS Style Guide rules for using shorthand where possible.

Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right.

Discussed in #14299.

cc: @jschatz1 

See merge request !3313
2016-03-22 12:32:46 +01:00
Robert SpeicherandRobert Speicher 534148e965 Merge branch 'issue_12658' into 'master'
Check if index exists before adding it

I got an error when updating GDK because it already exists.

[ci skip]

See merge request !3335
2016-03-21 22:40:56 -04:00
Robert SpeicherandRobert Speicher c8cc1c16d1 Merge branch 'issue_12658' into 'master'
Add group visibility level

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051

Closes #12658

See merge request !3323
2016-03-21 21:37:57 -04:00
Rémy Coutable 939f306ab4 Version 8.6.0-rc5 v8.6.0-rc5 2016-03-21 17:46:30 +01:00
Dmitriy ZaporozhetsandRémy Coutable 834dae6f64 Merge branch 'fix-image-mode-view-diff' into 'master'
Fix diff image view modes (2-up, swipe, onion skin) not working

Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8

Closes #13856

See merge request !3316
2016-03-21 16:41:30 +01:00
Rémy Coutable c5e015e972 Merge branch 'workhorse-0.7.1' into 'master'
Use gitlab-workhorse 0.7.1

A small extra defense against interrupted git raw responses. Nice to
have in 8.6 because we introduce /raw/ caching; it would be
unfortunate if incorrect (truncated) responses got cached.

See merge request !3330
2016-03-21 16:41:12 +01:00
Robert SpeicherandRémy Coutable b881282486 Merge branch 'issues-show-performance' into 'master'
Improve performance of viewing individual issues

This MR does two things:

1. `Issue#related_branches` no longer performs Git operations that aren't needed
2. The output of `Repository#exists?` is now cached and flushed properly

Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages).

See merge request !3296
2016-03-21 16:40:54 +01:00
Kamil TrzcińskiandRémy Coutable ab3681d149 Merge branch 'feature/issue-move' into 'master'
Ability to move issue to another project

Tasks:

- [x] Create scaffold of service that will move issue to another project.
- [x] Close old issue, add system note about moving issue to a new project.
- [x] Create a new issue, add system note about issue being moved from old project.
- [x] Check if issue can be moved to another project before executing service
- [x] Check permissions when moving an issue (`:admin_issue` ability)
- [x] Display select box for a new project when editing an issue
- [x] Show only projects that issue can be moved into in that select box
- [x] Add project select handler, helper and some permission filters to it
- [x] Preserve as much information as possible, including author
- [x] Prepare mechanisms that unfolds local references in issue description
- [x] Rewrite issue description with references unfolding and add some specs for it
- [x] Rewrite all system notes and comments attached to issue that is being moved
- [x] Update `Label` so that is was able to create cross reference labels (separate MR)
- [x] Add notifications about moving issue to another project
- [x] Display confirmation alert/message when issue move has been requested
- [x] Make it possible to undo selecting project where issue will be moved to
- [x] Add column to issue, that will indicate if it has been moved to another project
- [x] Do not allow to move issue that has been already moved
- [x] Write top-to-bottom feature spec in RSpec instead of Spinach

UI:

![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png)

![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png)

Closes #3024

See merge request !2831
2016-03-21 16:40:17 +01:00
Robert SpeicherandRémy Coutable c7f3bee7ff Merge branch 'no-gc-retry' into 'master'
Do not retry "git gc"

To prevent 'git gc' timing out on a large repo and then bouncing
around in the retry queue.

See merge request !3266
2016-03-21 12:37:20 +01:00
Douwe MaanandRémy Coutable d22c1069d3 Merge branch 'fix/gitlab-omniauth-issue' into 'master'
attempting to fix omniauth problem

Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361

See merge request !2876
2016-03-21 12:37:02 +01:00
Jacob SchatzandRémy Coutable a2484ae052 Merge branch 'css-zero-unit-again' into 'master'
Fix a few remaining uses of `0px`.

See #14299 for more information.

cc: @jschatz1 

See merge request !3310
2016-03-21 12:36:46 +01:00
Douwe MaanandRémy Coutable 21e54d947d Merge branch 'fix-image-diff' into 'master'
Fix bug where wrong commit ID was being used in a merge request diff to show old image

Closes #3769

Closes #14327

See merge request !3300
2016-03-21 12:33:06 +01:00
Jacob SchatzandRémy Coutable 42c4304133 Merge branch 'remove-wip' into 'master'
Easily (un)mark merge request as WIP using link

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516

## Link to add `WIP` prefix (underline is visible because of hover)
![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png)

## Link to remove `WIP` prefix
![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png)

## System note after WIP is added
![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png)

## Widget with link to remove WIP
![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png)

## Flash after WIP is removed
![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png)

## System note after WIP is removed
![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png)

## Widget when current user cannot remove the WIP prefix
![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png)

cc @creamzy 

See merge request !3006
2016-03-21 12:31:20 +01:00
Rémy Coutable e6961c4681 Merge branch 'backport-ee-premailer' into 'master'
Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318
2016-03-21 12:30:58 +01:00
Jacob SchatzandRémy Coutable aadbe61022 Merge branch 'rs-auto-expand-sidebar' into 'master'
Expand the issuable sidebar when coming back from the Changes tab

Unless the user explicitly requested the collapsed sidebar.

Fixes: #14353

See merge request !3256
2016-03-21 12:30:45 +01:00
Douwe MaanandRémy Coutable a4e19b6cb0 Merge branch 'issue-branch-iid-postfix' into 'master'
#to_branch_name now uses the iid as postfix

Given the branch name 'mep-mep' with an iid being 1,
the current way, master's way, would yield a branch name of
1-mep-mep. The problem for larger projects however would be that
a developer might forget what iid the issue was.

When this developer would try to tab complete it would:
- Or result in 20+ branches possibly
- Or start with the wrong digit, try again with digit++
  - Would see 20 branches, repeat

Thus the obvious way of solving this is letting the dev tab complete
on the issue title, which is easier to remember.

@DouweM Should this be labelled `pick-in-master`? 

See merge request !3308
2016-03-21 12:30:29 +01:00
Robert SpeicherandRémy Coutable 8b90b1f3d4 Merge branch 'fix/14418' into 'master'
Dedupe labels in labels selector in Dashboard pages

Fixes #14418.

See merge request !3311
2016-03-21 12:29:58 +01:00