home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,084 Commits 48 Branches 340 Tags
63cbebfe6c2229dd2c65bd82ee1b97aed5bcabbf
Commit Graph
10084 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 63cbebfe6c Merge pull request #7081 from cirosantilli/conflict-artifact 
Remove conflict artifact.
 2014-06-05 16:46:09 +02:00
Dmitriy Zaporozhets 70a6af9328 Merge branch 'milestone-merged-mr-list' into 'master' 
Milestone merged mr list

Part of #1207
 2014-06-05 13:46:13 +00:00
Dmitriy Zaporozhets ffd50e8cf5 Add merged mrs list to milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 16:28:13 +03:00
Ciro Santilli 27f32ac648 Remove conflict artifact. 2014-06-05 14:47:51 +02:00
Dmitriy Zaporozhets 7e41eca38a Merge branch 'milestone-mr-dragging' into 'master' 
Milestone merge request dragging

This is part of #1207.
 2014-06-05 10:25:47 +00:00
Dmitriy Zaporozhets 336d50d008 Merge request drag-n-drop on milestone page 
Allows moving milestone between 3 columns: unassigned, assigned,
declined

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 13:01:49 +03:00
Dmitriy Zaporozhets 9bd1afd721 Merge branch 'ruby2.1' into 'master' 
Ruby2.1

Fixed #1075
 2014-06-05 07:19:58 +00:00
Dmitriy Zaporozhets 868629dc40 Merge pull request #7077 from bbodenmiller/patch-2 
improve no projects screen
 2014-06-05 10:12:27 +03:00
Dmitriy Zaporozhets bb36768941 Merge branch 'milestone-issues-dragging' into 'master' 
Milestone issues dragging

This is part of #1207.
I will submit this feature with small but finished merge requests.
 2014-06-05 07:08:18 +00:00
Sytse Sijbrandij 4ed39a77ef Support Ruby 2.1 and better explain the memory requirements. 2014-06-05 08:45:12 +02:00
Dmitriy Zaporozhets 248a3e5688 Fix help page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 09:39:03 +03:00
Dmitriy Zaporozhets 9654b098c6 Milestone drag-n-drop with 3 columns 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 09:29:24 +03:00
Ben Bodenmiller 829c7282a3 improve no projects screen 
* correct odd capitalization pattern in tagline
* remove "click on button" statement as telling a user to click something is not a good web development practice
* add missing period for consistency
 2014-06-04 18:14:31 -07:00
Dmitriy Zaporozhets eeef2c7350 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 20:39:43 +03:00
Dmitriy Zaporozhets a76bf07ae2 Merge branch 'performance-improve' into 'master' 
More performance improvements for large groups

* fetch team members using much less sql queries
* collect mentioned users without iterating over all project users
 2014-06-04 17:16:20 +00:00
Dmitriy Zaporozhets 181aa2b916 More efficient query for mentionable users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 19:23:31 +03:00
Dmitriy Zaporozhets 0cedd7039a Prevent a lot of sql queries for ProjectTeam#fetch_members method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 19:20:25 +03:00
Dmitriy Zaporozhets f1ec62f465 Add reopened tab to milestone issues. Add ids and data to milestone issues to enable dragging 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 18:52:35 +03:00
Dmitriy Zaporozhets 47937802a2 Add js milestone class. Activate drag-drop for issues on milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 18:51:01 +03:00
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
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
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