summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 8.6.3v8.6.3Rémy Coutable2016-04-011-1/+1
|
* Merge branch 'fix/update-gitlab-shell' into 'master' Douwe Maan2016-04-012-2/+2
| | | | | | | Update gitlab-shell version and doc to 2.6.12 See merge request !280
* Remove "(unreleased)" for 8.6.3Rémy Coutable2016-04-011-1/+1
| | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into ↵Rémy Coutable2016-04-013-0/+18
| | | | | | | | | | | | | | '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>
* Merge branch 'fix_wip_in_mr_api' into 'master'Robert Speicher2016-04-014-5/+17
| | | | | | | | | | 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>
* Merge branch 'filter-dropdown-bug' into 'master'Rémy Coutable2016-04-016-8/+10
| | | | | | | | | | | | 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>
* Merge branch ↵Douwe Maan2016-04-017-30/+52
| | | | | | | | | | | | '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>
* Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'master'Douwe Maan2016-04-013-25/+77
| | | | | | | | | | 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>
* Merge branch 'fix/issue-move-rewrite-uploads' into 'master'Douwe Maan2016-04-019-25/+200
| | | | | | | | | | Rewrite uploads when moving issue to another project Closes #14531 See merge request !3382 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix-commit-comment' into 'master'Rémy Coutable2016-03-312-3/+3
| | | | | | | | | | Fix commit comment alignment Closes #14780 See merge request !3466 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'patch/fix-mergerequest-diff' into 'master'Robert Speicher2016-03-314-7/+8
| | | | | | | | | | | | 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>
* Merge branch 'fix-todos' into 'master' Rémy Coutable2016-03-317-2/+45
| | | | | | | | | Destroy related todos when an Issue/MR is deleted Closes #14550 Closes #14598 See merge request !3376
* Version 8.6.2v8.6.2Rémy Coutable2016-03-301-1/+1
|
* When looking for a filter hidden input field, look for it by name onlyRémy Coutable2016-03-301-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'notification-settings-save' into 'master'Rémy Coutable2016-03-302-16/+18
| | | | | | | | | | Fixed issue with notification settings not saving Closes #14736 See merge request !3452 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '8-6-stable' of github.com:gitlabhq/gitlabhq into 8-6-stableRémy Coutable2016-03-301-1/+1
|\
| * Merge pull request #10108 from nmadhok/patch-1Achilleas Pipinellis2016-03-281-1/+1
| |\ | | | | | | Update patch_versions.md
| | * Update patch_versions.mdNitin Madhok2016-03-261-1/+1
| |/
* | Merge branch 'fix-mr-comment-commit-pruned' into 'master'Robert Speicher2016-03-303-4/+10
| | | | | | | | | | | | | | | | | | | | Gracefully handle notes on deleted commits in merge requests Closes #3250 See merge request !3402 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'rs-banzai-requires' into 'master'Rémy Coutable2016-03-3019-38/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'added-milestone-upcoming' into 'master'Rémy Coutable2016-03-3013-59/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'issue_14671' into 'master'Stan Hu2016-03-302-2/+2
| | | | | | | | | | | | | | | | | | | | Fix cancel button on issuables Fixes #14671 See merge request !3417 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master'Rémy Coutable2016-03-292-25/+22
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'fix/nomethod-error-on-ci' into 'master'Rémy Coutable2016-03-294-21/+32
| | | | | | | | | | | | | | | | Fix error when visiting CI root path Closes #14528, closes #14687 See merge request !3377
* | Merge branch 'fix-14607' into 'master'Douwe Maan2016-03-297-16/+389
| | | | | | | | | | | | | | | | Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
* | Merge branch 'rs-remove-wip-tabindex' into 'master' Douwe Maan2016-03-291-2/+2
| | | | | | | | | | | | | | Remove tabstop from the WIP toggle links [ci skip] See merge request !3426
* | Merge branch 'issue_14643' into 'master'Robert Speicher2016-03-292-2/+1
| | | | | | | | | | | | | | | | Fix background when editing a highlighted note Fixes #14643 See merge request !3423
* | Merge branch 'issue_14610' into 'master'Robert Speicher2016-03-292-2/+3
| | | | | | | | | | | | Fix cancel button on issuable edit form See merge request !3392
* | Merge branch 'project-dropdown-width' into 'master'Jacob Schatz2016-03-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'ci-setup-info' into 'master'Dmitriy Zaporozhets2016-03-295-1/+47
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'fix-password-settings-regressions' into 'master'Jacob Schatz2016-03-292-8/+10
| | | | | | | | | | | | | | | | | | | | Shows password form when signed in with linked account Closes #14379 Doing this to get the builds passing for !3325 See merge request !3381
* | Merge branch ↵Douwe Maan2016-03-292-1/+2
| | | | | | | | | | | | | | | | | | | | '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
* | Merge branch ↵Douwe Maan2016-03-295-31/+62
| | | | | | | | | | | | | | | | | | | | '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
* | Merge branch 'fix-milestone-upcoming' into 'master'Robert Speicher2016-03-292-1/+2
| | | | | | | | | | | | | | | | Fix Milestone.upcoming The order wasn't happening because of `default_scope`. Blegh. See merge request !3364
* | Merge branch 'fix-application-settings' into 'master'Robert Speicher2016-03-292-1/+2
| | | | | | | | | | | | | | | | Fixed error with applications delete anonymous token form Closes #14509 See merge request !3362
* | Merge branch 'sidebar-bold-fix' into 'master'Jacob Schatz2016-03-292-1/+2
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'dropdown-alignment-fixes' into 'master'Jacob Schatz2016-03-2910-68/+197
| | | | | | | | | | | | | | | | Dropdown pixel perfect :tada: Closes #14333, #14331, #14472, #14515 See merge request !3337
* | Merge branch 'issue-sidebar-overlap' into 'master'Jacob Schatz2016-03-293-83/+59
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'dropdown-right-align' into 'master'Jacob Schatz2016-03-293-3/+6
|/ | | | | | | | | | | | 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
* Version 8.6.1v8.6.1Rémy Coutable2016-03-231-1/+1
|
* Remove "(unreleased)" from the CHANGELOGRémy Coutable2016-03-231-1/+3
| | | | [ci skip]
* Merge branch 'fix-build-dependencies' into 'master'Rémy Coutable2016-03-233-4/+11
| | | | | | | | Fix build dependencies, when the dependency is a string Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14485 See merge request !3344
* Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master'Douwe Maan2016-03-233-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'fix/14505' into 'master'Rémy Coutable2016-03-2311-41/+62
| | | | | | | | Fix an issue causing the Dashboard/Milestones page to be blank Fixes #14505 and #14514. See merge request !3348
* Merge branch 'merge-request-sidebar' into 'master'Jacob Schatz2016-03-235-31/+31
| | | | | | | | | | 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
* Merge branch 'issue_13885' into 'master'Jacob Schatz2016-03-238-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'fix-milestone-assign' into 'master'Jacob Schatz2016-03-232-1/+2
| | | | | | | | Fixes issue with assign milestone not loading milestone list cc. @jschatz1 See merge request !3346
* Merge branch 'label-dropdown-errors' into 'master'Jacob Schatz2016-03-235-1/+22
| | | | | | | | | | 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
* Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into ↵Douwe Maan2016-03-232-1/+3
| | | | | | | | | | 'master' User has to confirm deletion of issuables Closes #14474 See merge request !3341
* Merge branch ↵Douwe Maan2016-03-235-1/+16
| | | | | | | | | | '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