home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GitLab 754b0838e0 Set x-frame-option to sameorigin to allow the Sidekiq iframe to display. 2014-06-03 15:17:08 +02: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 67b0857d29 Merge branch 'revert-img-paste' into 'master' 
Revert img paste

Fixes #1307
 2014-06-03 10:00:30 +00: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 84dc9cd692 Update mysql2 gem. 2014-06-03 11:39:29 +02:00
Marin Jankovski ef7cfdceea Update jasmine. 2014-06-03 11:39:29 +02:00
Marin Jankovski 209726917b Fix the system_hook test. 2014-06-03 11:37:23 +02:00
Marin Jankovski ecfd33c12f Add acts-as-taggable-on-patch for gem version 2.4.1 and Rails 4.1. 2014-06-03 11:37:23 +02:00
Marin Jankovski e18d5be55a Remove active_record.auto_explain_treshold_in_seconds, rails 4.0 deprecation 2014-06-03 11:37:23 +02:00
Marin Jankovski 7bf64b2648 Convert to array since Relation no longer returns an array. 2014-06-03 11:37:23 +02:00
Marin Jankovski 1dca950c28 Fix failing submodule test. 2014-06-03 11:37:23 +02:00
Marin Jankovski 9abee4eac8 Add a state_machine patch for rails 4.1. 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 51d5e4cd6e Bump to Rails 4.1. 2014-06-03 11:37:23 +02:00
Marin Jankovski a727d25eee Merge pull request #7062 from williamherry/fix_add_smtp_settings_to_gitignore 
add smtp_settings.rb to gitignore file
 2014-06-03 10:41:38 +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 31fcac9ff9 Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 07:50:18 +00: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 a54bef0a42 Merge pull request #6943 from jvanbaarsen/spec-fix 
Fix for failing specs
 2014-06-03 09:13:33 +03:00
Dmitriy Zaporozhets fc72f8e37c Merge branch 'performance-improvements' into 'master' 
Performance improvements

Fixes #1135
 2014-06-02 19:06:51 +00: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
William Herry 3410aaf950 add smtp_settings.rb to gitignore file 2014-06-03 01:05:07 +08: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 34cf3c4916 Merge branch 'developers-protected-branches' into 'master' 
Dont show new file link on protected branch for developers
 2014-06-02 14:40:37 +00: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 c7f8bb4c9b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-02 14:52:42 +03: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 0d475208ac Merge branch 'updater_location' into 'master' 
Updater one liner based on location

Fixes #1303
 2014-06-02 11:51:16 +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
Marin Jankovski c8460c4731 Update the one-liner. 2014-06-02 09:48:55 +02:00
Marin Jankovski 379299ad18 Add bash one liner in updater doc due to change of updater location. 2014-06-02 09:39:43 +02:00
Dmitriy Zaporozhets 3f972e0e53 Merge pull request #7053 from jvanbaarsen/removed_support_email 
Removed the Support Email setting
 2014-06-01 14:41:31 +03:00