home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,919 Commits 48 Branches 340 Tags
f1d1dc00a93288623a012a933203ed99dc71fed8
Commit Graph
25919 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Barbosa Alexandre f1d1dc00a9 Update CHANGELOG 2016-03-31 10:46:07 -03:00
Douglas Barbosa Alexandre db36ef60e9 Remove todos for deleted merge requests 2016-03-31 10:46:06 -03:00
Douglas Barbosa Alexandre 9b93f8adc8 Destroy related todos when an issue is deleted 2016-03-30 12:09:34 -03:00
Douglas Barbosa Alexandre 07e1ec5dc1 Fix error 500 when target is nil on todo list 2016-03-30 12:09:34 -03:00
Rémy Coutable 8718acdf80 Add 8.6.2 CHANGELOG items 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-30 16:57:15 +02:00
Dmitriy Zaporozhets 4a01b5e293 Merge branch 'functional-closed-sidebar' into 'master' 
Functional closed sidebar

Adds functionality to include the closed sidebar.

When sidebar is closed the details will be visible once changed in open sidebar.

This MR fixes some bugs and adds some features from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3175

Fixes: #13594  

See merge request !3411
 2016-03-30 12:18:26 +00:00
Jacob Schatz b4ce4e6f06 Remove console logs 2016-03-30 07:26:34 -04:00
Jacob Schatz a121ee51bf Off the event initially 2016-03-30 07:26:34 -04:00
Jacob Schatz e7650492f2 Collapsed sidebar opens over instead of pushing content. 2016-03-30 07:26:34 -04:00
Jacob Schatz 509bc3fbe4 Sidebar collapse update issue 2016-03-30 07:26:34 -04:00
Jacob SchatzandJacob Schatz 697895676f User selection from collapsed sidebar 2016-03-30 07:26:09 -04:00
Jacob SchatzandJacob Schatz 750cd5c0e0 Add json response for user avatar in merge request 2016-03-30 07:26:09 -04:00
Jacob SchatzandJacob Schatz cb6192986a Make changed values visible in minimized sidebar. 2016-03-30 07:26:09 -04:00
Rémy Coutable 7b2af8740d Merge branch 'notification-settings-save' into 'master' 
Fixed issue with notification settings not saving

Closes #14736

See merge request !3452
 2016-03-30 08:42:13 +00:00
Phil Hughes 0a7974e584 Fixed issue with notification settings not saving 
Closes #14736
 2016-03-30 08:40:44 +01:00
Rémy Coutable a9346cab20 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
 2016-03-30 06:59:50 +00:00
Rémy Coutable 4a4398560c 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
 2016-03-30 06:49:04 +00:00
Robert Speicher f7d20a6f76 Merge branch 'fix-mr-comment-commit-pruned' into 'master' 
Gracefully handle notes on deleted commits in merge requests

Closes #3250

See merge request !3402
 2016-03-29 20:25:12 +00:00
Robert Speicher 999ae7f76b Merge branch 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' 
api - expose label description

Resolves #14415

See merge request !3314
 2016-03-29 16:21:16 -04:00
Robert Speicher a9f5df384e 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
 2016-03-29 18:49:08 +00:00
Phil Hughes 6a3d8ac207 Spec updates 2016-03-29 18:20:10 +01:00
Robert Speicher b1f924c165 Merge branch 'handle-nil-description-slack-message' into 'master' 
Handle nil descriptions in Slack issue messages

Closes #14676

See merge request !3420
 2016-03-29 16:30:55 +00:00
Robert Speicher c19195f485 Merge branch 'gitlab-shell-2.7' into 'master' 
Updated gitlab-shell to 2.7

This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.

See merge request !3437
 2016-03-29 15:56:17 +00:00
Phil Hughes 31fea92295 Updated based on Ruby feedback 2016-03-29 15:26:12 +01:00
Yorick Peterse 67be43e6a3 Updated gitlab-shell to 2.7 
This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.
 2016-03-29 15:46:47 +02:00
Phil Hughes b5ece0886a Ruby fixes 2016-03-29 12:19:09 +01:00
Phil Hughes 35b3c7096d Fixed multiselect 2016-03-29 12:17:22 +01:00
Phil Hughes f8b5ff9520 Fixed rubocop issues 2016-03-29 11:59:42 +01:00
Phil Hughes f3b162a9ac Fixed issue with milestone not being un-selectable 2016-03-29 11:59:42 +01:00
Phil Hughes 88024b17c0 Standardised the output of the JSON to always include the name 
The frontend will then always use the name as the ID - like previous
 2016-03-29 11:59:13 +01:00
Dmitriy Zaporozhets 54957d6932 Merge branch 'rs-fix-migrations' into 'master' 
Use raw SQL instead of Rails models in migrations where appropriate

Closes #14694.

See merge request !3429
 2016-03-29 10:58:12 +00:00
Phil Hughes 3aeda8c94f Removed un-used code 2016-03-29 11:58:11 +01:00
Phil Hughes a6d7c69521 Updated to only include upcoming on filters 
Fixes tests
 2016-03-29 11:58:11 +01:00
Phil Hughes c9dea7761d Added tests for upcoming milestone filter 2016-03-29 11:57:04 +01:00
Phil Hughes 7ff6af19cc Dropdown bug fixes 
Added back upcoming to milestone filter
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
 2016-03-29 11:57:04 +01:00
Rémy Coutable f4238634d3 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 10:36:34 +00:00
Rémy Coutable 00726e4df9 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 10:32:38 +00:00
Marin Jankovski af8df7e598 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-03-29 11:52:56 +02:00
Douwe Maan 98fbde5422 Merge branch 'rs-remove-wip-tabindex' into 'master' 
Remove tabstop from the WIP toggle links

[ci skip]

See merge request !3426
 2016-03-29 08:21:59 +00:00
Douwe Maan a7ca8689f7 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 08:21:48 +00:00
Grzegorz Bizon b7685b57d3 Redirect to root path when visiting /ci 2016-03-29 08:04:17 +02:00
Abhi Rao 762d6ab4fd Ensuring Merge Request API returns boolean values for work_in_progress 
Fixes #14692
 2016-03-28 22:11:44 -05:00
Jacob Schatz 828ad5f68f Merge branch 'fix-dropdown-item-height' into 'master' 
Fix dropdown line height

**Before**

![Screen_Shot_2016-03-28_at_5.54.37_PM](/uploads/67681da80b9104924083f13af3833553/Screen_Shot_2016-03-28_at_5.54.37_PM.png)

**After**

![Screen_Shot_2016-03-28_at_5.57.37_PM](/uploads/5df14c2d131cc88dbc75b87959f56c3c/Screen_Shot_2016-03-28_at_5.57.37_PM.png)


See merge request !3431
 2016-03-29 01:45:15 +00:00
Jacob Schatz f734f49520 Merge branch 'fix_rightsidebar_overlapping_build_section' into 'master' 
Fix right sidebar overlapping build section in merge request

closes #14608 

![build](/uploads/d1902f5fa335274c92ac1b1a8193466f/build.gif)


See merge request !3415
 2016-03-29 01:26:21 +00:00
Alfredo Sumaran 7b8a4dd351 Set properly line heights 2016-03-28 17:57:59 -05:00
Robert Speicher 47a539dfd7 Use raw SQL instead of Rails models in migrations where appropriate 
Closes #14694.
 2016-03-28 18:03:29 -04:00
Jacob Schatz 795199bf04 Merge branch 'add_link_to_fork_counter_button' into 'master' 
Add link to forks pages in fork counter button

closes #14412 

![fork_link](/uploads/5afef05bc592b0cf1c90ae4d154aed87/fork_link.gif)

See merge request !3387
 2016-03-28 21:46:56 +00:00
Dmitriy Zaporozhets d73e128859 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-03-28 23:22:15 +02:00
Robert Speicher 8406318d87 Remove tabstop from the WIP toggle links 
[ci skip]
 2016-03-28 17:04:27 -04:00
Dmitriy Zaporozhets 55df9a70bf Merge branch 'functional-sidebar' into 'master' 
Updates sidebar to use new dropdowns for issues and merge requests

Fixes #12935, #13164 

See merge request !3175
 2016-03-28 20:59:13 +00:00