home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets ad60701e9e Add only open/reopen scopes to issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 18:10:53 +03:00
Dmitriy Zaporozhets d95d56f0b9 Add current_user_id to gon vars 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 18:07:15 +03:00
Dmitriy Zaporozhets ec8d39897c Merge branch 'perforemance-improve' into 'master' 
Performance improve

Fixes #1315.
For group with 500 users it reduce amount of sql queries from 500 to 20.
It reduces page load ~ 3 times or even more. For larger group it will be even more difference
 2014-06-04 10:49:08 +00:00
Dmitriy Zaporozhets 671756e9ff Merge branch 'improve-mr-tabs' into 'master' 
Improve MR tabs UI/UX

![Screenshot 2014-06-04 12.29.19](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/b75785b28f/Screenshot_2014-06-04_12.29.19.png)
 2014-06-04 10:41:29 +00:00
Dmitriy Zaporozhets a89c590ffe Prevent exceptions for methods like ProjectTeam#developer? if no membership exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 12:56:03 +03:00
Dmitriy Zaporozhets b9c6ca1496 Make MR tabs look like tabs :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 12:29:05 +03:00
Dmitriy Zaporozhets 554c484467 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-04 12:03:28 +03:00
Dmitriy Zaporozhets 23da4cb4f9 Merge branch 'fix-500-on-labels-page' into 'master' 
Fix 500 on labels page
 2014-06-04 09:01:50 +00:00
Dmitriy Zaporozhets 781efd183a Merge branch 'broadcast-3-digit-colors' into 'master' 
Broadcast 3 digit colors
 2014-06-04 09:01:22 +00:00
Dmitriy Zaporozhets c283fba3b7 Improve performance of application for large teams 
This commit fixes a lot of sql queries to db for for groups and projects
with big amount of members.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 11:52:17 +03:00
Sytse Sijbrandij 6e18d5e9be Merge branch 'master' into 'master' 
Fixing typo in help for public access

Fixing a typo in the help page
 2014-06-04 08:16:34 +00:00
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
Sytse Sijbrandij 4d85bc21ba Document that we don't want pushed commits to be rebased and give a rationale for many small MR's policy. 2014-06-04 10:08:15 +02:00
Dmitriy Zaporozhets 74bcc8321e Allow set broadcast color with 3 digits like #444 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 11:04:36 +03:00
Dmitriy Zaporozhets 5921c74813 Mention 4.1 rails update in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 10:58:40 +03:00
Kaizer Sogiawala 0d861c9935 Fixing typo 2014-06-04 00:57:14 -07:00
Sytse Sijbrandij 6360ce0955 Merge branch 'update/patch_doc' into 'master' 
Update patch release document
 2014-06-04 07:38:31 +00: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 4147fc7eb6 Update patch release document. 2014-06-04 09:27:23 +02:00
Sytse Sijbrandij 9e924c70f3 Merge pull request #7067 from cirosantilli/doc-md-style 
Update docs to match new markdown style guide 2
 2014-06-04 08:49:45 +02:00
Marin Jankovski 18b1f171bd Rename snippets scopes to plural names. 2014-06-04 08:37:19 +02:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Dmitriy Zaporozhets de1a7aa7eb Add some entries to changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 22:46:54 +03:00
Dmitriy Zaporozhets 0c869ed75c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-03 22:41:04 +03: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
Sytse Sijbrandij df92f825fc Small spelling correction in the readme. 2014-06-03 19:12:01 +02:00
Sytse Sijbrandij ab7a9347a1 Merge branch 'chrome-app' into 'master' 
Chrome app
 2014-06-03 17:10:27 +00:00
Sytse Sijbrandij 7a385b811c Add chrome app of Go Sueyoshi. 2014-06-03 19:10:03 +02: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 605dfc9c32 Merge branch 'same-origin-header' into 'master' 
Same origin header

Fixes #1313
 2014-06-03 15:30:56 +00:00
Corey Hinshaw 62e523f4f4 Project commit count respects default branch. Closes #299 2014-06-03 11:22:29 -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
GitLab fdcc5ddec1 Ensure sidekiq is displayed by setting X-Frame-Options. 2014-06-03 17:06:27 +02: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 a5208596f4 Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 14:26:00 +00:00
GitLab f758438ed5 Revert "Set x-frame-option to sameorigin to allow the Sidekiq iframe to display." 
This reverts commit 754b0838e0.

Sidekiq rendered via mounted sinatra app. We don't need to change
controller headers. It won't affect sidekiq at all. Please modify nginx
config instead for all gitlab app.
 2014-06-03 15:44:46 +02: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
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