home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,973 Commits 48 Branches 340 Tags
7b0feec29deb287d4ebfc2a545ee42fcd4119209
Commit Graph
1200 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
Dmitriy Zaporozhets fd39c80f8b No text shadow for state-label 2013-10-17 12:33:39 +03:00
Dmitriy Zaporozhets a4de8f71c7 Minor UI improvement for ui-box-show 2013-10-17 12:31:49 +03:00
Dmitriy Zaporozhets 9afc930b99 Make ui-box-show more visible. Refactor some css classes 2013-10-16 20:42:42 +03:00
Dmitriy Zaporozhets b65a0461d1 Revert "Move warning about 0 ssh keys to bottom of page" 
This reverts commit 20c47923a1.
 2013-10-13 14:22:40 +03:00
Dmitriy Zaporozhets 20c47923a1 Move warning about 0 ssh keys to bottom of page 2013-10-13 11:11:10 +03:00
Dmitriy Zaporozhets 70b793eb7a Lighter border color for ui-box. Show closed keyword for issues list 2013-10-13 11:00:51 +03:00
Dmitriy Zaporozhets 573c89e624 Improve Profile#account page UI 2013-10-10 10:30:07 +03:00
Dmitriy Zaporozhets ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets 87ffd67617 Improve Profile settings UI 2013-10-09 12:30:49 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets eb7072de91 Fix avatar margin for files view 2013-10-07 16:56:02 +03:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
Dmitriy Zaporozhets 89654431ea Group#ldap_cn selectbox with ajax autocomplete via api 2013-10-01 12:04:14 +03:00
Dmitriy Zaporozhets 538b76972a LDAP groups select js 2013-10-01 11:07:45 +03:00
Dmitriy Zaporozhets dd2847f538 Few UI fixes for notes 2013-09-30 09:50:30 +03:00
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Dmitriy Zaporozhets 8674e1c227 Group has multiple owners so no sense to show one at dashboard list 2013-09-26 10:02:18 +03:00
Dmitriy Zaporozhets f1fd47875c Merge branch 'epic/public_projects' of /home/git/repositories/gitlab/gitlabhq 2013-09-25 13:25:47 +00:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2 
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
 2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 66998f6d46 Allow non authenticated user access to public projects 2013-09-24 15:58:39 +03:00
Dmitriy Zaporozhets 0009016b68 Fix commits table highlight 2013-09-24 11:50:37 +00:00
Dmitriy Zaporozhets e894e3eea5 Restyle sign-in page. Mention public projects 2013-09-24 12:27:25 +03:00
Dmitriy Zaporozhets 9587506124 Dont override default table with bootstrap class. Refactor table css 2013-09-24 12:08:28 +03:00
Dmitriy Zaporozhets 8fb83bc81e Fix hover for tree view 2013-09-22 08:48:04 +00:00
Sytse Sijbrandij 5367e42bd6 Restyle event title 2013-09-21 20:59:46 +02:00
Sytse Sijbrandij 1a5cde17ac Restyle tree table UI 2013-09-21 20:34:14 +02:00
Dmitriy Zaporozhets 90dc5ff5fd Fix 500 error on admin->project page 2013-09-14 21:18:01 +03:00
Dmitriy Zaporozhets df92d4ff67 Merge pull request #5072 from jbornschein/proj-new-public 
Add "public-project?" checkbox to new-project view
 2013-09-14 06:19:56 -07:00
Joerg Bornschein 83b212a4ef Add public-project? checkbox to new-project view 2013-09-13 14:39:04 +02:00
Marin Jankovski 91e112ffe2 Replace remote url on selection. 2013-09-13 10:12:42 +02:00
Dmitriy Zaporozhets f774949d3f Compare page improved 
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
 2013-09-12 20:15:10 +03:00
Dmitriy Zaporozhets 4002561e17 New landing page when you have 0 projects 2013-09-11 22:20:51 +03:00
Dmitriy Zaporozhets 94d364e8cc UI fixes for commits lists 2013-09-10 13:15:49 +03:00
Dmitriy Zaporozhets a30ce86690 Improve commits list UI 2013-09-10 10:17:15 +03:00
Dmitriy Zaporozhets 9ad5d9a4c6 Merge branch 'feature/mr_description' of /home/git/repositories/gitlab/gitlabhq 2013-09-09 15:44:48 +00:00
Dmitriy Zaporozhets e0ca2adafd Improve Merge Request form 
* added description
* simplified form
* enabled gfm autocomplete
 2013-09-09 17:11:58 +03:00
Dmitriy Zaporozhets 9e9f055141 Move commits dates to left 2013-09-09 16:20:43 +03:00
Boyan Tabakov 01ff084a4d Improved large commit handling. 
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
 2013-09-07 14:44:03 +03:00
Dmitriy Zaporozhets 54faf7871e Use normal font-weight for file names on tree view 2013-09-03 00:09:20 +03:00
Dmitriy Zaporozhets b320884149 List groups on Dashboard#projects page 2013-08-29 21:45:19 +03:00
Dmitriy Zaporozhets 3d41e182c2 Minor UI fix 2013-08-29 21:11:01 +03:00
Dmitriy Zaporozhets 643a6e5824 Improve admin user show page 
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets a2a7c8093b Use flash message for notification across app 2013-08-27 12:18:53 +03:00
Dmitriy Zaporozhets 0787726ae7 Set correct header border-bottom color for themes 2013-08-26 21:13:54 +03:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Dmitriy Zaporozhets 4675ff46e8 Remove bottom margin for text in event note 2013-08-26 15:49:11 +03:00
Dmitriy Zaporozhets 45c3925020 Better style for blockquote text in comments 2013-08-26 13:50:13 +03:00
Dmitriy Zaporozhets fede36f089 Add z-index to flash message 2013-08-21 12:40:02 +03:00