home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
2020 Commits
Author SHA1 Message Date
skv-headless 8ec02ed9aa per request project rules caching 2014-06-14 14:05:25 +04:00
Dmitriy Zaporozhets 49506fc71a Merge remote-tracking branch 'origin/issue_closing_widget' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-06-14 12:40:42 +03:00
Dmitriy Zaporozhets eb7845682d Improve files/snippets action buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 20:21:48 +03:00
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
Dmitriy Zaporozhets a7345e368a Fix gravatar size and update docs for new users API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 18:02:42 +03:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Dmitriy Zaporozhets 7ed935b676 Use gitlab_git to get commit_count in repo. It allows get commits count for git repos with 100k+ commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:13:31 +03: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 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
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 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 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
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 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 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 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 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 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
Dmitriy Zaporozhets f39db7e5ed Case-insensetive search for issue/mr title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 18:02:03 +03:00
Marin Jankovski 90c2e0d971 Replace now forbidden keywords public and private for snippets scope 2014-06-03 11:37:23 +02:00
Dmitriy Zaporozhets e9de569458 Fix tests for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 13:43:07 +03:00
Kyle Fazzari c1b1c32196 Add summaries for notes and merge requests to dashboard feed. 
This fixes #305.
 2014-05-29 07:55:55 -07:00
Dmitriy Zaporozhets e6beb60903 Merge branch 'raise-hard-limit' into 'master' 
Raise hard limit
 2014-05-29 14:11:17 +00:00
Dmitriy Zaporozhets aea79b8035 Add ability rule for creating project in namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:01 +03:00
dosire 7795a4b90c The hard limit should be a lot more liberal, 10x seems reasonable. 2014-05-28 15:08:27 +02:00
Dmitriy Zaporozhets a18ae13e98 Backport CI service refactoring from EE 
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 11:35:43 +03:00
Dmitriy Zaporozhets affd376f7a Dont show remove source branch ckecbox/button if you dont have such 
permissions for MR page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 18:51:41 +03:00
Dmitriy Zaporozhets 695fd3cf2c Move protected branches to Project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 14:25:55 +03:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 23de3551ab Add MergeRequest#target_project_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:37:36 +03:00
Dmitriy Zaporozhets 4fea8afc4b Add CompareAction class for collecting commits and diffs using satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 16:14:24 +03:00
Dmitriy Zaporozhets e640481625 Merge branch 'files_in_wiki' into 'master' 
Add support to show files from wiki repository on wiki pages
 2014-05-06 10:21:05 +00:00
Marin Jankovski fac225780c A bit clearer naming for gollum_wiki. 2014-05-05 14:01:48 +02:00
Dmitriy Zaporozhets c608a5dcea Add sort dropdown for admin projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 17:02:57 +03:00
Dmitriy Zaporozhets d10b34a685 Save repository size to projects table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 16:05:08 +03:00
Marin Jankovski cb69baedd3 Remove empty line. 2014-04-30 11:48:46 +02:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Marin Jankovski c4b1a5f5ea Allow nested files in wiki. 2014-04-28 16:22:31 +02:00
Dmitriy Zaporozhets ae7bd9f7c0 Migrate invalid rows with missing iids or duplicates 2014-04-24 19:39:33 +02:00