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,096 Commits 48 Branches 340 Tags
9bca8ae8f2feefe42acbdb61004ff5c3ec2a8a65
Commit Graph
10096 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeroen van Baarsen 9bca8ae8f2 Gemfile fix 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-05 21:20:33 +02:00
Dmitriy Zaporozhets db779388fe Merge pull request #7075 from jvanbaarsen/split-spinach-tests 
Splitted the Spinach tests to prevent time-outs
 2014-06-05 21:56:48 +03:00
Dmitriy Zaporozhets 08c3c0659c Merge pull request #7086 from jvanbaarsen/revert-rspec-fix 
Revert "Fix for failing specs"
 2014-06-05 21:45:35 +03:00
Dmitriy Zaporozhets 77b6bd9b49 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-05 21:41:04 +03:00
Dmitriy Zaporozhets f38f0e9dbf Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-05 21:40:59 +03:00
Dmitriy Zaporozhets a105101c45 Merge branch 'improve-projects-collecting' into 'master' 
Improve projects collecting

Refactor code that cause unexpected AR behaviour.

For example this works fine:

    @projects = Project.personal(@user).accessible_to(current_user)
    @groups = @user.groups.accessible_to(current_user) # OK

But

    @projects = Project.all
    @groups = @user.groups.accessible_to(current_user) # PG:Error
 2014-06-05 18:38:30 +00:00
Jeroen van Baarsen 2545b0f858 Revert "Fix for failing specs" 
This reverts commit 2314438925.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
 2014-06-05 20:21:28 +02:00
Dmitriy Zaporozhets 0fdce4a52b Refactor some search scopes to prevent wierd behaviour and PG::Error issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 20:37:35 +03:00
Dmitriy Zaporozhets 4ca6ebf017 Add GroupFinder for collection all groups user has access to 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 20:36:59 +03:00
Sytse Sijbrandij 63cbebfe6c Merge pull request #7081 from cirosantilli/conflict-artifact 
Remove conflict artifact.
 2014-06-05 16:46:09 +02:00
Sytse Sijbrandij 2751638f24 Merge branch 'gitlab-ssl-nginx' into 'master' 
Move nginx ssl config from gitlab recipes

I removed references to puma and did a minor cleanup :)

Also updated the README in gitlab-recipes to point here. Once this gets merged I'll remove it from there.
 2014-06-05 14:41:19 +00:00
Achilleas Pipinellis 7be6b8ca73 Move gitlab-ssl nginx config from gitlab-recipes 2014-06-05 16:54:50 +03: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
Jeroen van Baarsen e84057da1b Splitted the Spinach tests to prevent time-outs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-04 22:55:27 +02: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