home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 06:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
13452 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f50b7b5c04 Merge branch 'merge-system-note' into 'master' 
Refactor merge request merge service

See merge request !1374
 2015-01-07 03:48:01 +00:00
Dmitriy Zaporozhets ee9849b736 Improve mr refresh service tests 2015-01-06 18:05:10 -08:00
Dmitriy Zaporozhets 7eeec5e45a Ooops! Removing debug line :) 2015-01-06 17:00:27 -08:00
Dmitriy Zaporozhets 1269faa6ad Merge pull request #8503 from cirosantilli/unused-ex-var 
Remove unused ex local variable from event.rb
 2015-01-06 16:54:27 -08:00
Dmitriy Zaporozhets 6e5c72f8a8 Merge branch 'fix-commits-link-mr' into 'master' 
Fix commit link on MR from fork

See merge request !1372
 2015-01-07 00:28:31 +00:00
Dmitriy Zaporozhets ccdf08d80a Refactor merge request merge service 
* Add system note when user merges MR in same way as it closes it
* Remove duplicating code
 2015-01-06 16:24:47 -08:00
Dmitriy Zaporozhets b55a0519ac Pass source project variable to commits list on MR page 2015-01-06 15:39:33 -08:00
Dmitriy Zaporozhets 842f9e03a8 Merge branch 'ui-improvements' into 'master' 
UI improvements

Improve filtering UI for next pages:

* dashboard projects page
* group milestones page
* project milestones page

See merge request !1370
 2015-01-06 21:49:29 +00:00
Dmitriy Zaporozhets b8f48bf414 Restyle and refactor dashboard projects page filtering 2015-01-06 13:09:56 -08:00
Dmitriy Zaporozhets 4165426725 Restyle and refactor milestones filter 2015-01-06 12:32:04 -08:00
Dmitriy Zaporozhets 560e717fd6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-06 10:35:54 -08:00
Dmitriy Zaporozhets 0adc26898e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-06 10:35:36 -08:00
Dmitriy Zaporozhets a023daaaf7 Merge branch 'chulkilee-ruby-2.2.0' into 'master' 
chulkilee ruby 2.2.0

Merged https://github.com/gitlabhq/gitlabhq/pull/8511 into master

See merge request !1369
 2015-01-06 18:34:19 +00:00
Dmitriy Zaporozhets b72f22ee15 Merge pull request #8495 from dblessing/fix_8432 
Merge request error display
 2015-01-06 10:07:10 -08:00
Dmitriy Zaporozhets 165199cb47 Merge branch 'event-last-push-styling-fix' into 'master' 
event-last-push styling fix

When viewing a fresh install of GitLab on a mobile device after a branch with a name of sufficient length, the broken styling can be seen as follows:

![Screen Shot 2015-01-05 at 9.37.32 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9b3ca84f1a/Screen_Shot_2015-01-05_at_9.37.32_PM.png)

I modified the css for .event-last-push and .event-last-push-text to make it look correct:

![Screen Shot 2015-01-05 at 9.37.50 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/43d5a912b3/Screen_Shot_2015-01-05_at_9.37.50_PM.png)

As this is a purely css change, I don't believe it will break any tests. The only occurrence of .event-last-push* is in ./app/views/events/_event_last_push.html.haml

See merge request !279
 2015-01-06 17:54:29 +00:00
Dmitriy Zaporozhets 39865feb83 Merge branch 'forms-action-padding-fix' into 'master' 
Forms action padding fix

The padding on the forms action is not adjusted based on screen width:

![Screen Shot 2015-01-05 at 9.48.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/09aa26807e/Screen_Shot_2015-01-05_at_9.48.30_PM.png)

I added a media query for .forms-action at min-width: $screen-sm-min and moved the padding-left: 17% into it:

![Screen Shot 2015-01-05 at 9.48.35 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/8bbd8eef8c/Screen_Shot_2015-01-05_at_9.48.35_PM.png)

Full width padding remains as is:

![Screen Shot 2015-01-05 at 9.53.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/a6232959cb/Screen_Shot_2015-01-05_at_9.53.30_PM.png)

As this is a purely css change, I don't believe it will break any tests. form-actions occur everywhere there are form actions.

See merge request !280
 2015-01-06 17:53:47 +00:00
Dmitriy Zaporozhets baf94a26a4 Merge branch 'dashboard-icon-styling' into 'master' 
Dashboard icon styling fix

When viewing a fresh install of GitLab on a mobile device, the styling for the dashboard item icon is broken in such a way that if the description div is more than 100px high, its contents wrap beneath the icon as shown below.

![Screen Shot 2015-01-05 at 7.11.37 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9ac2feca33/Screen_Shot_2015-01-05_at_7.11.37_PM.png)

I modified the css for the icon and added a new class to the description div and now it behaves as expected as shown below.

![Screen Shot 2015-01-05 at 6.56.33 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/25cf3212d2/Screen_Shot_2015-01-05_at_6.56.33_PM.png)

As this is a purely html/css change, I don't believe it will break any tests. The only occurrence of .dashboard-intro-icon is in ./app/views/dashboard/_zero_authorized_projects.html.haml

See merge request !278
 2015-01-06 17:52:41 +00:00
Dmitriy Zaporozhets 21a6e32243 Merge branch 'ruby-2.2.0' of https://github.com/chulkilee/gitlabhq into chulkilee-ruby-2.2.0 2015-01-06 09:41:49 -08:00
Jacob Vosmaer af56c1dd32 White-list requests from 127.0.0.1 
On some misconfigured GitLab servers, if you look in production.log it looks
like all requests come from 127.0.0.1. To avoid unwanted banning we
white-list 127.0.0.1 with this commit.
 2015-01-06 16:56:56 +01:00
Job van der Voort c470072523 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-06 12:32:41 +01:00
Job van der Voort 446390e61c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-06 12:32:28 +01:00
Job van der Voort a2dd02ea81 Merge branch 'doc/redis-session-cleanup' into 'master' 
Document Redis session cleanup

We used this process on gitlab.com; it may be useful for other large GitLab instances too.

See merge request !1367
 2015-01-06 11:04:26 +00:00
Jacob Vosmaer a33d2f8653 Document Redis session cleanup 2015-01-06 11:50:05 +01:00
Wanfung Joshua Lee 252443893c removing padding on form-actions when in mobile size [ci skip] 2015-01-05 21:48:04 -08:00
Wanfung Joshua Lee 33a5106857 fix event-last-push message's styling on mobile [ci skip] 2015-01-05 21:36:58 -08:00
Wanfung Joshua Lee 3d7519016f fix the wacky dashboard intro icon styling [ci skip] 2015-01-05 20:04:53 -08:00
Patricio Cano cc282dd00e Updated CHANGELOG to include changes for 7.5.1-3 2015-01-05 22:40:38 -05:00
Dmitriy Zaporozhets d884c21004 Merge branch 'create-merge-request-view' into 'master' 
Create merge request view

Updated the create merge request view to use the horizontal form layout, and added tabs for commits and changes.
Also updated commits layout to use the same as the projects commits layout.

Screenshots: [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/892d1bf4c0/Screenshot_from_2014-12-29_20_33_19.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/508b3100c7/Screenshot_from_2014-12-29_20_34_40.png)

Fixes #923

See merge request !270
 2015-01-05 19:19:05 +00:00
Dmitriy Zaporozhets 7e6030e40c Merge branch 'create-issue-view' into 'master' 
Create issue view

This changes the create/edit issue view, to only show the create milestone/label links if the user is allowed to create one, and puts the 'Please review the guidelines for contribution to this repository' message above the submit button.

Screenshots [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/ae2ff67f88/Screenshot_from_2014-12-29_20_43_06.png) - [After (allowed)](https://gitlab.com/uploads/stephanvl/gitlab-ce/3a4682d776/Screenshot_from_2014-12-29_20_43_29.png) - [After (not allowed)](https://gitlab.com/uploads/stephanvl/gitlab-ce/86a548d3b3/Screenshot_from_2014-12-29_20_44_00.png)

See merge request !272
 2015-01-05 19:17:29 +00:00
Dmitriy Zaporozhets 9b3ab90adb Merge branch 'fix/deleted_file' into 'master' 
Fix deleted file representation with new gitlab_git gem

Added this MR as per request from https://github.com/gitlabhq/gitlabhq/pull/7980

* Add new gitlab_gem as per gitlab-org/gitlab_git!6
* Fix the showing of deleted file, as it only displays the named of the file, rather than specifying what had happened

**Before**

![Screen Shot 2014-12-30 at 21.02.55](https://gitlab.com/uploads/arif-ali/gitlab-ce/67ec88b06d/Screen_Shot_2014-12-30_at_21.02.55.png)

**After**

![Screen Shot 2014-12-30 at 21.05.18](https://gitlab.com/uploads/arif-ali/gitlab-ce/050b689c82/Screen_Shot_2014-12-30_at_21.05.18.png)

See merge request !273
 2015-01-05 19:15:15 +00:00
Dmitriy Zaporozhets 1ce14dd759 Merge branch 'fix-xmlns-namespacing-atom-feeds' into 'master' 
Fix xmlns:media namespacing for atom feeds

A recent commit gitlab-org/gitlab-ce@d31d711a70 introduced a bug that broke four of the atom feeds. The namespace for xmlns:media was not defined properly. This patch fixes the issues for all four feeds.

See merge request !274
 2015-01-05 19:13:21 +00:00
Dmitriy Zaporozhets dbdccd5d03 Merge pull request #8534 from jvanbaarsen/fix-wonky-tests 
make sure the user.name is escaped
 2015-01-05 21:10:23 +02:00
Robert Schilling 0c07da8887 Merge branch 'use_plural' into 'master' 
Use plural on permissions doc

See merge request !276
 2015-01-05 17:34:01 +00:00
Jacob Vosmaer 52bc4e79f8 Close standard input in Gitlab::Popen.popen 2015-01-05 11:51:21 +01:00
Achilleas Pipinellis 9993a0e356 Use plural instead of refering explicitly to male/female. 2015-01-05 12:44:42 +02:00
Jeroen van Baarsen 2a4ee2fd7f make sure the user.name is escaped 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-01-04 14:09:35 +01:00
Dmitriy Zaporozhets 5dbbec4612 Merge pull request #8520 from cirosantilli/edit-blob-link-tests 
Add tests for disabled blob edit button cases v2
 2015-01-03 14:07:43 +02:00
Dmitriy Zaporozhets e8fc5591a2 Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-01-03 11:14:05 +02:00
Dmitriy Zaporozhets 252e4fd996 Merge pull request #8489 from yglukhov/wiki-md-preview 
Markdown preview in wiki
 2015-01-03 11:05:42 +02:00
Dmitriy Zaporozhets d1ca3544f9 Merge pull request #8528 from Razer6/fix_group_avatar 
Raise group avatar filesize limit to 200kb, fixes #8527
 2015-01-03 11:03:05 +02:00
Robert Schilling 05dd6309ba Raise group avatar filesize limit to 200kb, fixes #8527 2015-01-02 14:54:51 +01:00
Jeremy Maziarz e5c0e2603a Fix xmlns:media namespacing for atom feeds 2014-12-31 15:05:38 -05:00
marmis85 021cff67f3 Flatten the directory hierarchy while there is only one directory descendant 2014-12-31 03:15:04 +01:00
Arif Ali 1d8dcfaf8b fix deleted file display when using new gitlab_git gem, and add new gitlab_git gem 2014-12-30 21:59:38 +00:00
Dmitriy Zaporozhets ac1584249c Merge branch 'improve-merge-widget' into 'master' 
Improve merge widget

* remove title `You can merge it` since button below says same
* fixed layout for custom commit message
* make button a bit bigger

See merge request !1365
 2014-12-30 18:47:29 +00:00
Dmitriy Zaporozhets 884352294d Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 20:10:46 +02:00
Stephan van Leeuwen 25c37b0e73 Fixed issue not being able to create a new issue on an empty project. 2014-12-30 18:53:46 +01:00
Ciro Santilli 18fa155025 Add tests for disabled blob edit button cases. 2014-12-30 18:19:48 +01:00
Dmitriy Zaporozhets 6e217bd55c Improve accept mr widget UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 17:28:34 +02:00
Marin Jankovski 0da5154b5a Fix api tests. 2014-12-30 15:40:11 +01:00