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,116 Commits 48 Branches 340 Tags
bcea7ba331e26c037dda9782f069bfb38f5bb602
Commit Graph
10116 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets bcea7ba331 Merge branch 'namespace-route' into 'master' 
Namespace route

Fixes #1312
 2014-06-07 12:50:45 +00:00
Dmitriy Zaporozhets 0d13abb1c8 Specify language detection for highlight.js 
Because I am tired of CHANGELOG highlighted as sql file :)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:46:58 +03:00
Dmitriy Zaporozhets 3dc0bce947 Add users to /:id route 
So now when you type site/:username it redirects you to users page.
And if you type site/:groupname it redirects you to group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:06:55 +03:00
Dmitriy Zaporozhets ab094e67ee Merge branch 'faster-diff-rendering' into 'master' 
Faster diff rendering

1. Dont render link in separate template but use helper instead
2. Don't build new object but just reuse variables

New note for diff is rendered per each diff line. Such simple improvements gives us 20..100% better performance depends on diff size
 2014-06-06 20:43:23 +00:00
Dmitriy Zaporozhets 2aef3b00cf Refactor link to new diff note rendering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 23:15:54 +03:00
Dmitriy Zaporozhets bc6a17a682 Smaller event width for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:33:52 +03:00
Dmitriy Zaporozhets 910a99f90b Improve tree view for mobile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:21:07 +03:00
Dmitriy Zaporozhets dd03841fea Make visibility icon more noticable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:09:52 +03:00
Dmitriy Zaporozhets 71d074a674 Use same color for icon, arrow and project title on dash sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:06:04 +03:00
Dmitriy Zaporozhets d325a279fb Small UI improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:01:34 +03:00
Dmitriy Zaporozhets 34d9f34a61 Improve select2 css to match bootstrap style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 21:39:30 +03:00
Dmitriy Zaporozhets 838bbb55e5 Use bootstrap default padding for nav-tabs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 20:41:42 +03:00
Dmitriy Zaporozhets 393b54613b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-06 20:36:22 +03:00
Dmitriy Zaporozhets 6a14736178 Merge branch 'protect_stable_branches' into 'master' 
Protect stable branches
 2014-06-06 14:56:07 +00:00
Jacob Vosmaer 1a87fb754e Protect stable branches 2014-06-06 09:36:19 +02:00
Dmitriy Zaporozhets 8ec42ff85c Merge pull request #7090 from NARKOZ/api-files-access 
fix permissions for files API
 2014-06-06 09:08:24 +03:00
Dmitriy Zaporozhets 67ba36ebac Revert "Revert "Fix for failing specs"" 
This reverts commit 2545b0f858.
 2014-06-06 09:01:17 +03:00
Dmitriy Zaporozhets 440036df69 Revert "Gemfile fix" 
This reverts commit 9bca8ae8f2.
 2014-06-06 09:01:09 +03:00
Nihad Abbasov dccfb374d3 fix permissions for files API 2014-06-06 06:58:20 +05:00
Dmitriy Zaporozhets f7cf028611 Merge pull request #7087 from jvanbaarsen/gemfilefix 
Gemfile fix
 2014-06-05 22:23:57 +03:00
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