home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a7be3dfa30 Remove set of thread variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:51:49 +03:00
skv-headless c8e6752414 fix link to notes in merge request diff 
http://localhost:3000/gitlabhq/gitlab-ci/merge_requests/1/diffs#note_316
scroll in such links doesn't work. It happens because  on page there are 2 elements with id="note_316" in changes and discussion.
Browser takes first for scroll.
This solution works because changes loads without diffs so tag with id="note_316" just one.
Diffs loads with discussions, but in this case diff tag would be first.
It is dirty but working solution.
 2014-06-10 16:23:35 +04:00
skv 20b2102771 notes count in 1 query for mr and commits 2014-06-10 16:10:53 +04:00
Dmitriy Zaporozhets 476cd0f763 Merge branch 'commit-count' into 'master' 
Project commit count for default branch

Currently, the commit count displayed on a project's home page shows the total number of commits on the master branch. This can lead to situations in which a project may have no commits reported or very few if the project workflow does not involve the use of a branch named "master". Since number of commits can be an indicator of project health, showing 0 commits could make it harder to encourage adoption of a project.

This MR alters the repository model's `commit_count` method to return the count for the default branch instead of master.

See issue #299
 2014-06-10 09:59:54 +00:00
Dmitriy Zaporozhets 55440ac9be Make a comment to MR whne milestone was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:33:17 +03:00
Dmitriy Zaporozhets 525fa6c11b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:29:23 +03:00
Dmitriy Zaporozhets 7edf65d1ee Make a system comment when issue milestone changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:25:43 +03:00
Dmitriy Zaporozhets 9a2fec5273 Merge branch 'public-profile-info' into 'master' 
Public profile info

Show small info about your profile being publicly because you joined public project![Screenshot 2014-06-07 15.17.17](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/eecf9a0bdc/Screenshot_2014-06-07_15.17.17.png)

Fixes #1321
 2014-06-07 12:51:00 +00:00
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 98d697a1a6 Show small notice at profile page about publicity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:18:01 +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
Loic Nageleisen c1ccc3a57b Added ability to serve files in wiki repository 
From #6168.
 2014-06-07 11:14:33 +02: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 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
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
erbunao 23626780c4 Fix for copy paste formatted text 2014-06-05 21:26:00 +08: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 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
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 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 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 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 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
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 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 18b1f171bd Rename snippets scopes to plural names. 2014-06-04 08:37:19 +02: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
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
Corey Hinshaw 62e523f4f4 Project commit count respects default branch. Closes #299 2014-06-03 11:22:29 -04:00