home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,462 Commits 48 Branches 340 Tags
v8.6.3
Commit Graph
25462 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémy Coutable 36572f8ec7 Update VERSION to 8.6.3 v8.6.3 2016-04-01 17:04:08 +02:00
Douwe MaanandRémy Coutable 4b4de7b7aa Merge branch 'fix/update-gitlab-shell' into 'master' 
Update gitlab-shell version and doc to 2.6.12



See merge request !280
 2016-04-01 16:29:26 +02:00
Rémy Coutable 80910076eb Remove "(unreleased)" for 8.6.3 
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-01 16:16:19 +02:00
Rémy Coutable ec3c66b986 Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master' 
Allow temp-oauth-email as notification email

Closes #14559

/cc @dblessing @rymai

See merge request !3477

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-01 16:14:38 +02:00
Robert SpeicherandRémy Coutable 6f45a89bab Merge branch 'fix_wip_in_mr_api' into 'master' 
Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-01 16:07:22 +02:00
Rémy Coutable eceaa30bf2 Merge branch 'filter-dropdown-bug' into 'master' 
Fixes issue with dropdowns not selecting values

Fixes issue with dropdowns not selecting when navigating between tabs

Closes #14813

See merge request !3478

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-01 11:21:08 +02:00
Douwe MaanandRémy Coutable 5f54c04cca Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' 
Fix Error 500 when searching for a comment in a project snippet

Closes #14764. /cc @stanhu, and thank you for the spec! ;)

See merge request !3468

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-01 10:52:31 +02:00
Douwe MaanandRémy Coutable 61027f40ec Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'master' 
Mentions on confidential issues doesn't create todos for non-members

Closes #14569

See merge request !3374

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-01 10:51:18 +02:00
Douwe MaanandRémy Coutable 36c8506b9b Merge branch 'fix/issue-move-rewrite-uploads' into 'master' 
Rewrite uploads when moving issue to another project

Closes #14531

See merge request !3382

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-01 10:01:22 +02:00
Rémy Coutable 2a5bfc461e Merge branch 'fix-commit-comment' into 'master' 
Fix commit comment alignment

Closes #14780

See merge request !3466

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-31 18:53:57 +02:00
Robert SpeicherandRémy Coutable 0a3f5adf92 Merge branch 'patch/fix-mergerequest-diff' into 'master' 
Fix Raw / Rendered diff producing different results on merge requests

The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`.

Fixes #14680, #3017

See merge request !3450

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-31 18:51:02 +02:00
Rémy Coutable e5d0af5657 Merge branch 'fix-todos' into 'master' 
Destroy related todos when an Issue/MR is deleted

Closes #14550 

Closes #14598

See merge request !3376
 2016-03-31 18:49:08 +02:00
Rémy Coutable 8b68b6f2d2 Version 8.6.2 v8.6.2 2016-03-30 15:15:15 +02:00
Rémy Coutable 99e7c91775 When looking for a filter hidden input field, look for it by name only 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-30 12:28:29 +02:00
Rémy Coutable 908700e121 Merge branch 'notification-settings-save' into 'master' 
Fixed issue with notification settings not saving

Closes #14736

See merge request !3452

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-30 10:43:25 +02:00
Rémy Coutable 1755b1643c Merge branch '8-6-stable' of github.com:gitlabhq/gitlabhq into 8-6-stable 2016-03-30 09:39:26 +02:00
Robert SpeicherandRémy Coutable a2d06cbff3 Merge branch 'fix-mr-comment-commit-pruned' into 'master' 
Gracefully handle notes on deleted commits in merge requests

Closes #3250

See merge request !3402

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-30 09:35:36 +02:00
Rémy Coutable 5e645889b1 Merge branch 'rs-banzai-requires' into 'master' 
Remove redundant `require`s from Banzai files

We're trying to avoid circular dependency errors.

Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521

Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/

See merge request !3391

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-30 09:28:02 +02:00
Rémy Coutable 07a4aacafc Merge branch 'added-milestone-upcoming' into 'master' 
Dropdown bug fixes

- Added back upcoming to milestone filter

![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png)

- Fixed bug that would cause the currently selected value to disappear on filters
- Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past

Closes #14536

See merge request !3368

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-30 09:26:54 +02:00
Stan HuandRémy Coutable 966ade1d75 Merge branch 'issue_14671' into 'master' 
Fix cancel button on issuables

Fixes #14671

See merge request !3417

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-30 07:39:14 +02:00
Rémy Coutable bc80f7faff Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master' 
Fix order of steps to prevent PostgreSQL errors when running migration

Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100.

/cc @stanhu @rodrigomanhaes

See merge request !3355
 2016-03-29 12:37:44 +02:00
Rémy Coutable 17c12be62f Merge branch 'fix/nomethod-error-on-ci' into 'master' 
Fix error when visiting CI root path

Closes #14528, closes #14687

See merge request !3377
 2016-03-29 12:35:06 +02:00
Douwe MaanandRémy Coutable 8d5a55ef39 Merge branch 'fix-14607' into 'master' 
Ensure private project snippets are not viewable by unauthorized people

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607

See merge request !1946
 2016-03-29 12:31:22 +02:00
Douwe MaanandRémy Coutable 7b1fa197a4 Merge branch 'rs-remove-wip-tabindex' into 'master' 
Remove tabstop from the WIP toggle links

[ci skip]

See merge request !3426
 2016-03-29 12:29:54 +02:00
Robert SpeicherandRémy Coutable e7f93e2b25 Merge branch 'issue_14643' into 'master' 
Fix background when editing a highlighted note

Fixes #14643

See merge request !3423
 2016-03-29 12:29:41 +02:00
Robert SpeicherandRémy Coutable 7d72f55099 Merge branch 'issue_14610' into 'master' 
Fix cancel button on issuable edit form

See merge request !3392
 2016-03-29 12:27:41 +02:00
Jacob SchatzandRémy Coutable 65daffdfd2 Merge branch 'project-dropdown-width' into 'master' 
Fixed issue with width of project select dropdown

Before:

![Screen_Shot_2016-03-24_at_13.42.53](/uploads/25580c45dc339f7f932f032ac2d10fba/Screen_Shot_2016-03-24_at_13.42.53.png)

![Screen_Shot_2016-03-24_at_13.43.04](/uploads/e4d1d4e332d27f14c980264bef9dc4d9/Screen_Shot_2016-03-24_at_13.43.04.png)

After:

![Screen_Shot_2016-03-24_at_13.42.38](/uploads/68b8e161d86b41849f9e8a1d9c8fd36c/Screen_Shot_2016-03-24_at_13.42.38.png)

![Screen_Shot_2016-03-24_at_13.43.13](/uploads/f3fe732bcd517efea3a1d7c761bb6a0e/Screen_Shot_2016-03-24_at_13.43.13.png)

See merge request !3386
 2016-03-29 12:26:41 +02:00
Dmitriy ZaporozhetsandRémy Coutable f8b9dda43d Merge branch 'ci-setup-info' into 'master' 
Add links to CI setup documentation from project settings and builds pages

For #14483

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3384
 2016-03-29 12:25:49 +02:00
Jacob SchatzandRémy Coutable b34edfb515 Merge branch 'fix-password-settings-regressions' into 'master' 
Shows password form when signed in with linked account

Closes #14379

Doing this to get the builds passing for !3325

See merge request !3381
 2016-03-29 12:24:45 +02:00
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
Achilleas Pipinellis c88a489c41 Merge pull request #10108 from nmadhok/patch-1 
Update patch_versions.md
 2016-03-28 20:39:37 +03:00
Nitin Madhok aed6126159 Update patch_versions.md 2016-03-26 00:58:44 -04: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