Software Publico / Gitlab

05 Jun, 2014

24 commits

f7cf0286 Merge pull request #7087 from jvanbaarsen/gemfilefix ... Browse Code »
```
Gemfile fix
```
Dmitriy Zaporozhets
2014-06-05 22:23:57 +0300
9bca8ae8 Gemfile fix ... Browse Code »
```
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
```
Jeroen van Baarsen
2014-06-05 21:20:33 +0200
db779388 Merge pull request #7075 from jvanbaarsen/split-spinach-tests ... Browse Code »
```
Splitted the Spinach tests to prevent time-outs
```
Dmitriy Zaporozhets
2014-06-05 21:56:48 +0300
08c3c065 Merge pull request #7086 from jvanbaarsen/revert-rspec-fix ... Browse Code »
```
Revert "Fix for failing specs"
```
Dmitriy Zaporozhets
2014-06-05 21:45:35 +0300
77b6bd9b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-06-05 21:41:04 +0300
f38f0e9d Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-06-05 21:40:59 +0300

a105101c Merge branch 'improve-projects-collecting' into 'master' ... Browse Code »

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 +0000

2545b0f8 Revert "Fix for failing specs" ... Browse Code »

This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31.

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

Conflicts:
	Gemfile.lock

2014-06-05 20:21:28 +0200

0fdce4a5 Refactor some search scopes to prevent wierd behaviour and PG::Error issues ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-05 20:37:35 +0300
4ca6ebf0 Add GroupFinder for collection all groups user has access to ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-05 20:36:59 +0300
63cbebfe Merge pull request #7081 from cirosantilli/conflict-artifact ... Browse Code »
```
Remove conflict artifact.
```
Sytse Sijbrandij
2014-06-05 16:46:09 +0200

2751638f Merge branch 'gitlab-ssl-nginx' into 'master' ... Browse Code »

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 +0000

7be6b8ca Move gitlab-ssl nginx config from gitlab-recipes Browse Code »

Achilleas Pipinellis
2014-06-05 16:54:50 +0300
70a6af93 Merge branch 'milestone-merged-mr-list' into 'master' ... Browse Code »
```
Milestone merged mr list

Part of #1207
```
Dmitriy Zaporozhets
2014-06-05 13:46:13 +0000
ffd50e8c Add merged mrs list to milestone page ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-05 16:28:13 +0300
27f32ac6 Remove conflict artifact. Browse Code »

Ciro Santilli
2014-06-05 14:47:51 +0200
7e41eca3 Merge branch 'milestone-mr-dragging' into 'master' ... Browse Code »
```
Milestone merge request dragging

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-05 13:01:49 +0300
9bd1afd7 Merge branch 'ruby2.1' into 'master' ... Browse Code »
```
Ruby2.1

Fixed #1075
```
Dmitriy Zaporozhets
2014-06-05 07:19:58 +0000
868629dc Merge pull request #7077 from bbodenmiller/patch-2 ... Browse Code »
```
improve no projects screen
```
Dmitriy Zaporozhets
2014-06-05 10:12:27 +0300
bb367689 Merge branch 'milestone-issues-dragging' into 'master' ... Browse Code »
```
Milestone issues dragging

This is part of #1207.
I will submit this feature with small but finished merge requests.
```
Dmitriy Zaporozhets
2014-06-05 07:08:18 +0000
4ed39a77 Support Ruby 2.1 and better explain the memory requirements. Browse Code »

Sytse Sijbrandij
2014-06-05 08:45:12 +0200
248a3e56 Fix help page UI ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-05 09:39:03 +0300
9654b098 Milestone drag-n-drop with 3 columns ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-05 09:29:24 +0300

04 Jun, 2014

16 commits

829c7282 improve no projects screen ... Browse Code »

* 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 -0700

e84057da Splitted the Spinach tests to prevent time-outs ... Browse Code »
```
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
```
Jeroen van Baarsen
2014-06-04 22:55:27 +0200
eeef2c73 Fix tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 20:39:43 +0300

a76bf07a Merge branch 'performance-improve' into 'master' ... Browse Code »

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 +0000

181aa2b9 More efficient query for mentionable users ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 19:23:31 +0300
0cedd703 Prevent a lot of sql queries for ProjectTeam#fetch_members method ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 19:20:25 +0300
f1ec62f4 Add reopened tab to milestone issues. Add ids and data to milestone issues to enable dragging ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 18:52:35 +0300
47937802 Add js milestone class. Activate drag-drop for issues on milestone page ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 18:51:01 +0300
ad60701e Add only open/reopen scopes to issues ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 18:10:53 +0300
d95d56f0 Add current_user_id to gon vars ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 18:07:15 +0300

ec8d3989 Merge branch 'perforemance-improve' into 'master' ... Browse Code »

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 +0000

671756e9 Merge branch 'improve-mr-tabs' into 'master' ... Browse Code »

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 +0000

a89c590f Prevent exceptions for methods like ProjectTeam#developer? if no membership exists ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 12:56:03 +0300
b9c6ca14 Make MR tabs look like tabs :) ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-04 12:29:05 +0300
554c4844 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-06-04 12:03:28 +0300
23da4cb4 Merge branch 'fix-500-on-labels-page' into 'master' ... Browse Code »
```
Fix 500 on labels page
```
Dmitriy Zaporozhets
2014-06-04 09:01:50 +0000