Commit Graph

291 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 132caae734 Move repo tags to own controller. add ability to remove tags 2013-07-16 23:12:52 +03:00
Dmitriy Zaporozhets a466b2175a Add create_branch, rm_branch methods to Gitlab::Shell class 2013-07-16 22:18:14 +03:00
Dmitriy Zaporozhets 559e83d300 Add LDAP support to /api/session 2013-07-16 11:28:19 +03:00
Dmitriy Zaporozhets 5181816970 Merge branch 'master' into 6-0-dev 2013-07-12 14:42:35 +03:00
Dmitriy Zaporozhets 6ace422c29 Merge branch 'master' into 6-0-dev
Conflicts:
	Gemfile
	Gemfile.lock
2013-07-08 09:50:10 +03:00
wuweixin 2c7b0d5a46 fix bug when project named: mediawiki
mediawiki.wiki.git
mediawiki.git

/.wiki$/ match awiki, so when your project named mediawiki
it will be find project named: "medi"

use /\.wiki$/ fix this bug
2013-07-06 09:31:56 +08:00
Robert Schilling 702dc30448 Add 'services' to path blacklist, fixes #4470 2013-07-03 12:57:35 +02:00
Dmitriy Zaporozhets 3c4689c23c Store satellites lock files inside satellites dir 2013-06-26 18:35:32 +03:00
Dmitriy Zaporozhets 58427749fd Update repository head when change default project branch 2013-06-25 17:05:39 +03:00
Dmitriy Zaporozhets 6577d3a49c Markdown now support users from groups 2013-06-22 00:06:21 +03:00
Dmitriy Zaporozhets 38a9fc4f47 Classic (mars) theme will be default for 6.0 2013-06-20 11:46:54 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets b4e8fea274 Refactor grack auth module. Add git over http wiki support 2013-06-14 14:42:55 +03:00
Dmitriy Zaporozhets 995e656add Add path blacklist 2013-06-12 22:11:35 +03:00
Dmitriy Zaporozhets 8f52501eb5 Fix inline diff issue. See #3150 2013-06-12 16:43:58 +03:00
Sato Hiroyuki c18564d2cb Fix abort gitlab:app:check
When the file that pointed git bin_path in gitlab.yml dose'nt exist,
bundle rake gitlab:app:check would be aborted.

refs #4205
2013-06-06 10:10:51 +09:00
Dmitriy Zaporozhets f1e0d37b15 Its better to load graph with ajax since it requires ~10 seconds for bigger projects to finish up 2013-06-05 15:50:11 +03:00
Karlo Soriano 71d67e6557 Contributors graphs feature for GitLab
Created tests and refactored some code along the way

Added stat graph util spec, refactored code

finsihed up tests and refactors

finsihed up tests and refactors
2013-06-05 16:51:48 +08:00
Andrey Kumanyaev 41f88f468a No check access if no relation between user and project 2013-06-01 19:40:20 +04:00
Andrey Kumanyaev 08c2c94d46 Fix bug with team assignation on project from #4109 2013-06-01 19:24:15 +04:00
Dmitriy Zaporozhets 888e493b82 Update membership instead of remove/add if it permissions were changed 2013-05-30 11:40:15 +03:00
Dmitriy Zaporozhets 31fdcac161 UserTeam: Fixed bug when impossible to change admin flag after checked 2013-05-30 11:25:34 +03:00
Dmitriy Zaporozhets 6e5b1686f4 TeamManagement: Dont update permissions if it was not changed 2013-05-30 11:13:38 +03:00
Pedro Guridi 5ec3129ea6 Changed regex to support Jira issue numbering format
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123.

Added Jira Issue tracker configuration example
2013-05-27 16:51:37 -03:00
Dmitriy Zaporozhets ec1055076c Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
Conflicts:
	config/gitlab.yml.example
2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets 63c6f30aba Fix ldap auth for http push 2013-05-24 20:36:28 +03:00
Dmitry Medvinsky 22279bc558 Add settings for user permission defaults
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
2013-05-16 18:02:22 +04:00
Dmitriy Zaporozhets 31f007f79f Fix skipping of some elements in makrdown 2013-05-16 12:54:10 +03:00
Dmitriy Zaporozhets 0fccee82b7 Dont parse gfm-extractions as commit. Increase gfm rendering speed. Especially for a lot of code snippets 2013-05-16 12:15:42 +03:00
Joe Andaverde ba21546a58 System calls were using unsanitized user input 2013-05-12 09:11:09 -05:00
Dmitriy Zaporozhets 9fdcdb774f Move blob_snippet to gitlab_git gem 2013-05-09 11:47:09 +03:00
Javier Castro 7f57fe5034 Implemented code search feature 2013-05-09 11:47:08 +03:00
Sato Hiroyuki 862e0ff6b8 Add Gitlab::VersionInfo class to fix and simplify version check.
It returns "yes" if required version is "1.7.10" and current version is "1.6.10",
because the patch version of current version equals to that of required version.
2013-05-08 17:36:48 +09:00
Dmitriy Zaporozhets 03441769df Include default labels in issues autocomplete etc. Show colored labels on issues show page 2013-05-07 19:26:41 +03:00
Dmitriy Zaporozhets be68cc4617 add Gitlab::Label class and different color labels for default labels set 2013-05-07 17:57:59 +03:00
Andrey Kumanyaev b1b354b0f8 remove trailing spaces 2013-05-05 18:02:02 +04:00
Andrey Kumanyaev 67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
Dmitriy Zaporozhets f40d4e6685 Merge pull request #3597 from amacarthur/fork-pull-request
updated fork feature to use gitlab-shell for v5 of gitlab
2013-05-02 23:41:07 -07:00
tsl0922 f1c9b05868 better fix for encoding error 2013-05-03 11:31:23 +08:00
tsl0922 4e055e8a63 fix: UTF-8 encoding error 2013-05-03 10:58:53 +08:00
tsl0922 ef61d1f200 fix http push 401 2013-05-03 10:58:53 +08:00
Dmitriy Zaporozhets 7ec1cfd5f5 Merge pull request #3758 from fredowski/master
Authenticate LDAP users in the grack module - fixed problems - tested code
2013-04-30 03:10:09 -07:00
Friedrich Beckmann 20a88f5c43 LDAP authentication in grack - check ldap conf before call / added comment 2013-04-29 22:26:03 +02:00
Dmitriy Zaporozhets fbb7cd8b76 fix wrong class name 2013-04-29 09:49:25 +03:00
Dmitriy Zaporozhets a1704273ec Refactor post-receive worker 2013-04-29 09:43:18 +03:00
Friedrich Beckmann 228baa80b2 LDAP Authentification with grack for https push - fixed password check 2013-04-27 23:31:48 +02:00
Dmitriy Zaporozhets 4f2d2c90f7 Move Gitlab::Git out of gitlab core 2013-04-27 23:50:17 +03:00
Sato Hiroyuki 05c2c15cd1 Fix Gitlab::Git::Repository#commit returns wrong commit, if commit_id is "tag name". 2013-04-25 20:54:00 +00:00
Dmitriy Zaporozhets 85ec345183 Prevent 500 error on git blame if empty file 2013-04-18 12:46:41 +03:00
Dmitriy Zaporozhets 14798b8e68 symbolize keys for Gitlab::Git::Diff & Gitlab::Git::Commit 2013-04-16 16:29:49 +03:00