home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Dmitriy Zaporozhets d02a22ba21 Redesign signin/singup pages 2015-01-07 17:07:36 -08:00
Dmitriy Zaporozhets de6256ee67 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-06 21:50:00 -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 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 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 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
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
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 252e4fd996 Merge pull request #8489 from yglukhov/wiki-md-preview 
Markdown preview in wiki
 2015-01-03 11:05:42 +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
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
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
Dmitriy Zaporozhets c957285727 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-30 16:39:10 +02:00
Dmitriy Zaporozhets 0930086bea Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 16:38:27 +02:00
Dmitriy Zaporozhets 792b9920fc Merge pull request #8513 from dblessing/fix_hipchat 
Fix HipChat Server
 2014-12-30 16:38:03 +02:00
Dmitriy Zaporozhets 2010ae11f3 Merge branch 'merge-request-commits-view' into 'master' 
Merge request commits view

Changes the commits view of a merge request to use the same layout as used in the project commits view.

As noticed from #923.

This also changes the commits icon on the tab to be fa-history, the same as used in the sidebar

Screenshots [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/8785737424/Screenshot_from_2014-12-29_20_39_25.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/a3bf2a790f/Screenshot_from_2014-12-29_20_40_23.png)

See merge request !271
 2014-12-30 13:40:13 +00:00
Dmitriy Zaporozhets 0991d19c0d Merge branch 'user_ssh_keys_on_admin' into 'master' 
User ssh keys on admin

Show user ssh keys on admin user page.

See merge request !1362
 2014-12-30 12:02:16 +00:00
Marin Jankovski 607ea7c6e5 Share the key table between admin and profile resources. 2014-12-30 11:01:30 +01:00
Dmitriy Zaporozhets 5d2e637c17 Group selectbox js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:48 +02:00
Dmitriy Zaporozhets 27ee0fc57b Helper for ajax group selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Drew Blessing 9f9f1b3b87 Fix HipChat Server 2014-12-29 18:51:39 -06:00
Dmitriy Zaporozhets da9d827904 Merge branch 'inline-protected-branches' into 'master' 
Improve UI for protected branches

See merge request !1361
 2014-12-29 21:08:21 +00:00
Dmitriy Zaporozhets 95cd5b275a Prevent content overflow for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 22:59:08 +02:00
Stephan van Leeuwen b753bfd145 Updated issuable form to only show create links if allowed, and added contribution guide url to form actions. 
Also changed icon for labels.
Removed contribution guide notice from issue form.
 2014-12-29 20:29:59 +01:00
Stephan van Leeuwen 4fe699fdc3 Updated create merge request submit view 
Create merge request submit view now uses the same form layout as creating an issue.
The commits view now uses the same layout as the project commits view
The commits and diffs are now in separate tabs, as used in the merge request view
 2014-12-29 20:14:51 +01:00
Dmitriy Zaporozhets a9cf84e5ac Merge pull request #7675 from yglukhov/patch_notes_api 
Implemented notes (body) patching in API.
 2014-12-29 21:06:49 +02:00
Dmitriy Zaporozhets 159ba9b958 Merge pull request #8496 from NARKOZ/644 
chmod -x
 2014-12-29 21:04:58 +02:00
Stephan van Leeuwen b97b854963 Updated merge request commits view 
The merge request commits tab now uses the same layout as used in the project commits view
 2014-12-29 19:10:53 +01:00
Dmitriy Zaporozhets 95c0393789 Inline protected branches list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:30:27 +02:00
Dmitriy Zaporozhets a0c4fa3174 Use same font size for all sidenav items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:11:34 +02:00
Dmitriy Zaporozhets e0459da2a6 Merge branch 'fix-services' into 'master' 
Fix async services execution broken in 7.6

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

See merge request !1360
 2014-12-29 16:31:49 +00:00
Marin Jankovski f0085d034b Reuse show page for user keys. 2014-12-29 17:09:39 +01:00
Marin Jankovski 492f3a4779 Add user key actions to admins. 2014-12-29 17:07:23 +01:00