home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,052 Commits 48 Branches 340 Tags
4e249dadb5bbcda8e36e6282a36ea2aa1b7900fd
Commit Graph
5096 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4e249dadb5 Fix 500 error when generate labels on labels page. Fixes #1311 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 11:08:21 +03:00
Dmitriy Zaporozhets d986aea3f0 Merge branch 'upgrade_to_rails_4.1' into 'master' 
Upgrade to rails 4.1
 2014-06-04 07:33:25 +00:00
Marin Jankovski 18b1f171bd Rename snippets scopes to plural names. 2014-06-04 08:37:19 +02:00
Dmitriy Zaporozhets 239b84e933 Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabled 
project: ci_service should only catch ci services
 2014-06-03 22:40:49 +03:00
Daniel Aquino be85d1d2b2 project: ci_service should only catch ci services 
ci_service should return true if a ci service is enabled.  Currently
it's checking for any service being enabled instead of only services in
the ci category.
 2014-06-03 11:46:47 -04:00
Dmitriy Zaporozhets d042257a39 Merge branch 'case-insensetive-search' into 'master' 
Case insensetive search

Fixes #1258

cc @marc
 2014-06-03 15:19:59 +00:00
Dmitriy Zaporozhets 4e37212a8c Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 15:10:41 +00:00
Dmitriy Zaporozhets 7984e5b1ef Show events from all projects on user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 18:09:51 +03:00
Dmitriy Zaporozhets f39db7e5ed Case-insensetive search for issue/mr title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 18:02:03 +03:00
Dmitriy Zaporozhets f870507659 Improve green theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 17:36:53 +03:00
Dmitriy Zaporozhets b6f3f62667 Merge branch 'remove_artifact' into 'master' 
Remove artifact

This commit 07a9d44de7 caused letter a to be shown 72 times when the commit is being edited, removed that.
 2014-06-03 14:27:00 +00:00
Dmitriy Zaporozhets ad432583a9 Improve UI/UX for create/edit group in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 16:40:50 +03:00
Dmitriy Zaporozhets 5b87a4dc51 Use same colors for disabled buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 16:22:52 +03:00
Dmitriy Zaporozhets d7960bca8d Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 12:50:23 +00:00
Dmitriy Zaporozhets fe302d4cb6 New base colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 15:47:57 +03:00
Dmitriy Zaporozhets 55ab7a2a95 Remove color-named css classes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 14:49:50 +03:00
Dmitriy Zaporozhets 729618c50f Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 11:43:16 +00:00
Dmitriy Zaporozhets 95d61a094d Improve admin/projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 14:19:11 +03:00
Dmitriy Zaporozhets 4e55dd5f14 Change page-title font/color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:57:26 +03:00
Dmitriy Zaporozhets 4656ef957a Replace files icons with fontawesome 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:40:07 +03:00
Marin Jankovski da37a251f9 Add ch width. 2014-06-03 12:33:43 +02:00
Dmitriy Zaporozhets 31c963edb1 Improve admin/user form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:05:06 +03:00
Dmitriy Zaporozhets fc43c4e7fa Restyle admin/user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 12:44:22 +03:00
Marin Jankovski 7bf64b2648 Convert to array since Relation no longer returns an array. 2014-06-03 11:37:23 +02:00
Marin Jankovski 79f8abc51f Replace snippets scopes in view and controller. 2014-06-03 11:37:23 +02:00
Marin Jankovski 90c2e0d971 Replace now forbidden keywords public and private for snippets scope 2014-06-03 11:37:23 +02:00
Marin Jankovski d2851b0883 Do not show a 72 times. 2014-06-03 10:36:27 +02:00
Dmitriy Zaporozhets 3398e0a3d7 Revert "Implements and refactors clipboard feature for markdown." 
This reverts commit 2273234653.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/issues/_form.html.haml
	app/views/projects/merge_requests/_form.html.haml
	app/views/projects/merge_requests/_new_submit.html.haml
	app/views/projects/milestones/_form.html.haml
	app/views/projects/notes/_form.html.haml
	app/views/projects/wikis/_form.html.haml
 2014-06-03 10:56:40 +03:00
Dmitriy Zaporozhets 87e0fe6f76 Use big colorful pills for switch between MR tabs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 10:27:50 +03:00
Dmitriy Zaporozhets 7bb0551fd9 Improve small panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 10:04:31 +03:00
Dmitriy Zaporozhets 636718adf0 Use padding like most of other bootstrap elements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 10:01:15 +03:00
Dmitriy Zaporozhets 5a064b0249 Get group members only if group not nil 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 21:25:01 +03:00
Dmitriy Zaporozhets 144212fba2 Add members paginations to admin/project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 19:31:43 +03:00
Dmitriy Zaporozhets 9a4c8f7e41 Improve admin group page performance 
Add pagination for projects and members to /admin/groups/:group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 18:58:00 +03:00
Dmitriy Zaporozhets d514833a15 Dont show new file link on protected branch for developers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 16:18:16 +03:00
Dmitriy Zaporozhets 2c46b35b10 Merge branch 'profile-personal-projects' into 'master' 
Show only personal projects on user page

When I visit user profile page I see all projects he have access too (if i can also access same projects).
That means I see a list of hundreds projects if he joined several groups. ![Screenshot 2014-05-30 18.24.43](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5209c0cb01/Screenshot_2014-05-30_18.24.43.png)

It inefficient because:

* Slow page load if a lot of projects
* Hard to find his personal projects

I propose to replace it with `Personal projects` list.

It has next advantages:

* we don't load huge useless list of projects
* I can see if user have personal projects I have access to
* faster page load. We don't load all projects from all groups where user invited

![Screenshot 2014-05-30 18.20.29](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/8a5d02a00d/Screenshot_2014-05-30_18.20.29.png)

Partly fixes #1135
 2014-06-02 12:31:50 +00:00
Dmitriy Zaporozhets 28cc199128 Merge branch 'ui-colors' into 'master' 
Refactoring ui colors
 2014-06-02 12:31:38 +00:00
Dmitriy Zaporozhets f9dd140280 Merge branch 'add_noreferrer_to_all_links' into 'master' 
Add nofollow to all external links

Fixes #1224
 2014-06-02 11:52:03 +00:00
Dmitriy Zaporozhets 133d231f87 Use link_color var more often 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 14:21:12 +03:00
Dmitriy Zaporozhets 33ff53d915 Fix syntax error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 14:13:35 +03:00
Dmitriy Zaporozhets 6854be80a8 Refactor scss variables. Use darker color for links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 14:12:46 +03:00
Dmitriy Zaporozhets e9de569458 Fix tests for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 13:43:07 +03:00
Dmitriy Zaporozhets 5d6f5be060 New colors for success/warning/primary 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:48:33 +03:00
Dmitriy Zaporozhets e53f4a4ea5 Use same color vars for primary/warning styles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:24:04 +03:00
Dmitriy Zaporozhets 8beb7c886e Different UI colors for archive project and remove project 
Since remove is more danger in compare to archive it good to have them
in different colors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:21:13 +03:00
Dmitriy Zaporozhets c2c43e6aa1 Small ui improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:00:23 +03:00
Dmitriy Zaporozhets 1a97db413b Simplify issue-box style 2014-05-31 00:41:11 +03:00
Dmitriy Zaporozhets e02aec6627 Use var colors for panels 2014-05-31 00:13:15 +03:00
Dmitriy Zaporozhets 5ba00d950b Add old ui-box style to panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-30 23:43:53 +03:00
Dmitriy Zaporozhets 72b295259e Show only personal projects on profile page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-30 18:22:59 +03:00