Dmitriy Zaporozhets
bb5e50e0f7
Fix edit files
2013-08-05 16:55:15 +03:00
Dmitriy Zaporozhets
b92655663c
Update main calls to gitlab_git
2013-08-05 16:51:04 +03:00
Dmitriy Zaporozhets
02e859a234
move backup logic to lib. Fixed removing outdated backups
2013-08-05 12:26:33 +03:00
Dmitriy Zaporozhets
af5faaf0e1
Move diff parsing to own class. Correctly identify note diff line
2013-08-04 20:43:49 +03:00
Dmitriy Zaporozhets
2d75b454ef
Store diff with line note. It makes possible to see inline notes with proper diff even if MR diff changed
2013-08-04 19:01:57 +03:00
Dmitriy Zaporozhets
49709b1d8a
Fix broken user link in email
2013-08-04 16:27:32 +03:00
Dmitriy Zaporozhets
0ef0150d8c
Merge branch 'destroy_duplicate_keys' of /home/git/repositories/gitlab/gitlabhq
2013-08-02 13:47:25 +00:00
Jacob Vosmaer
1dda34f306
Delete duplicate keys in migrate_keys task
2013-08-02 15:43:30 +02:00
Robert Schilling
e08f977bb9
Add 'repository' to path blacklist, fixes #4591
2013-07-30 20:23:30 +02:00
Jakub Zienkiewicz
e03d01d036
extract server-side git commands to constants
2013-07-30 10:15:36 +02:00
Jakub Zienkiewicz
5e35f21605
allow all git-upload-* commands for deploy keys
2013-07-30 10:15:36 +02:00
Johannes Schleifenbaum
cd19f82e51
Fix typos
2013-07-29 12:47:06 +02:00
Dmitriy Zaporozhets
475f607a22
Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored in different location
2013-07-18 13:55:01 +03:00
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
5768f98d8d
Require gitlab-shell 1.6.0
2013-07-16 21:39:39 +03:00
Dmitriy Zaporozhets
559e83d300
Add LDAP support to /api/session
2013-07-16 11:28:19 +03:00
Angus MacArthur
ace5c54ab9
enhance project creation apis to allow setting of public attribute
...
Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
2013-07-12 12:10:42 -04:00
Dmitriy Zaporozhets
92ef845fa5
Merge branch 'master' into 6-0-dev
...
Conflicts:
VERSION
2013-07-12 16:16:20 +03:00
Dmitriy Zaporozhets
5181816970
Merge branch 'master' into 6-0-dev
2013-07-12 14:42:35 +03:00
Axilleas Pipinellis
ec38d6290c
Removal of gitlab.socket should be in stop function too. Fix #4313
2013-07-12 11:48:57 +03:00
Dmitriy Zaporozhets
8cdfa86b57
Merge pull request #3993 from bke-drewb/3599
...
Issue 3599: Add snippets_enabled flag to projects for API
2013-07-11 09:54:15 -07:00
Dmitriy Zaporozhets
7740005b76
Merge pull request #4264 from andrewwutw/fix-postgresql-restore
...
Fix PostgreSQL database restoration problem (#4217 )
2013-07-11 09:52:43 -07:00
Dmitriy Zaporozhets
79a989fa0f
Merge pull request #4398 from Razer6/remove_gitolite_check
...
Remove gitolite repo check for import script
2013-07-11 09:23:21 -07:00
Dmitriy Zaporozhets
1de30b9120
Merge pull request #4502 from wuwx/patch-1
...
fix bug when project named: mediawiki
2013-07-11 09:21:53 -07:00
Dmitriy Zaporozhets
6a9aed1e87
Merge branch 'master' into 6-0-dev
...
Conflicts:
CHANGELOG
VERSION
app/views/admin/teams/projects/new.html.haml
app/views/projects/teams/available.html.haml
doc/install/installation.md
2013-07-10 14:03:00 +03:00
Dmitriy Zaporozhets
381638b77f
Merge pull request #4510 from Razer6/fix_not_found_lexers
...
Fix Pygments 500 error if lexer not found by name
2013-07-10 03:58:41 -07:00
Angus MacArthur
ea5a006f27
Additon of apis for fork administration.
...
Added ability to add and remove the forked from/to relatioinship
between existing repos.
2013-07-08 17:34:00 -04:00
Dmitriy Zaporozhets
967d42e0c8
Fix unicorn init and config
2013-07-08 19:28:59 +03:00
Dmitriy Zaporozhets
87f4e1f153
init.d script for unicorn
2013-07-08 18:28:40 +03:00
Dmitriy Zaporozhets
6ace422c29
Merge branch 'master' into 6-0-dev
...
Conflicts:
Gemfile
Gemfile.lock
2013-07-08 09:50:10 +03:00
Robert Schilling
db325ef940
Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473 , #4451
2013-07-07 19:00:07 +02: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
113d2ff525
store and display public key fingerprint
2013-06-24 20:07:21 +03:00
Robert Schilling
c6464aa859
Remove gitolite repo check for import script
2013-06-23 19:00:10 +02:00
Dmitriy Zaporozhets
8d70ac008d
Merge branch 'master' into 6-0-dev
...
Conflicts:
VERSION
db/schema.rb
2013-06-22 11:19:12 +03:00
Dmitriy Zaporozhets
9de23248d8
You should not be able to remove a Group owner
2013-06-22 11:02:31 +03:00
Dmitriy Zaporozhets
6577d3a49c
Markdown now support users from groups
2013-06-22 00:06:21 +03:00
Sytse Sijbrandij
76f2e065ea
Merge branch 'master' into install-guide-improvements
...
Conflicts:
doc/install/installation.md
2013-06-21 21:18:20 +02:00
Dmitriy Zaporozhets
38a9fc4f47
Classic (mars) theme will be default for 6.0
2013-06-20 11:46:54 +03:00
Dmitriy Zaporozhets
b3ef63a0a5
Migrate global project taks. Removed more teams related functionality
2013-06-19 19:48:48 +03:00
Dmitriy Zaporozhets
cf8b465cb9
Remove Global namespace from options. Prepared file for migration of global projects
2013-06-19 18:32:08 +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
Sytse Sijbrandij
f01d482427
Make the installation guide easier to follow for non-unix people.
2013-06-12 21:30:36 +02:00
Sytse Sijbrandij
70e80d95a7
When stopped correctly there should be no warning about a missing socket file.
2013-06-12 21:30:13 +02:00
Dmitriy Zaporozhets
995e656add
Add path blacklist
2013-06-12 22:11:35 +03:00