summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* enhance project creation apis to allow setting of public attributeAngus MacArthur2013-07-122-3/+7
| | | | Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
* Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-121-3/+5
|\ | | | | | | | | Conflicts: VERSION
| * Removal of gitlab.socket should be in stop function too. Fix #4313Axilleas Pipinellis2013-07-121-3/+5
| |
* | Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-125-14/+16
|\ \ | |/
| * Merge pull request #3993 from bke-drewb/3599Dmitriy Zaporozhets2013-07-112-10/+14
| |\ | | | | | | Issue 3599: Add snippets_enabled flag to projects for API
| | * Issue 3599: Add snippets_enabled flag to projects for APIDrew Blessing2013-06-112-10/+14
| | | | | | | | | | | | | | | | | | s 3599: Add snippets_enabled flag to projects for API Replace missing comma
| * | Merge pull request #4264 from andrewwutw/fix-postgresql-restoreDmitriy Zaporozhets2013-07-111-1/+1
| |\ \ | | | | | | | | Fix PostgreSQL database restoration problem (#4217)
| | * | Fix PostgreSQL database restoration problem (#4217)andrewwutw2013-06-101-1/+1
| | | | | | | | | | | | Use psql instead of pg_restore to restore SQL dump file.
| * | | Merge pull request #4398 from Razer6/remove_gitolite_checkDmitriy Zaporozhets2013-07-111-2/+0
| |\ \ \ | | | | | | | | | | Remove gitolite repo check for import script
| | * | | Remove gitolite repo check for import scriptRobert Schilling2013-06-231-2/+0
| | | | |
| * | | | Merge pull request #4502 from wuwx/patch-1Dmitriy Zaporozhets2013-07-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | fix bug when project named: mediawiki
| | * | | | fix bug when project named: mediawikiwuweixin2013-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-104-4/+47
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md
| * | | | | Merge pull request #4510 from Razer6/fix_not_found_lexersDmitriy Zaporozhets2013-07-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix Pygments 500 error if lexer not found by name
| | * | | | | Fix Pygments 500 error if lexer not found by name. Use first alias instead. ↵Robert Schilling2013-07-071-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | fixes #4473, #4451
| * | | | | Additon of apis for fork administration.Angus MacArthur2013-07-083-3/+46
| |/ / / / | | | | | | | | | | | | | | | | | | | | Added ability to add and remove the forked from/to relatioinship between existing repos.
* | | | | Fix unicorn init and configDmitriy Zaporozhets2013-07-081-1/+1
| | | | |
* | | | | init.d script for unicornDmitriy Zaporozhets2013-07-081-0/+138
| | | | |
* | | | | Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-081-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock
| * | | | Add 'services' to path blacklist, fixes #4470Robert Schilling2013-07-031-1/+1
| |/ / /
* | | | Store satellites lock files inside satellites dirDmitriy Zaporozhets2013-06-261-1/+12
| | | |
* | | | Update repository head when change default project branchDmitriy Zaporozhets2013-06-251-0/+12
| | | |
* | | | store and display public key fingerprintDmitriy Zaporozhets2013-06-241-0/+15
| | | |
* | | | Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-06-222-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: VERSION db/schema.rb
| * | | Merge branch 'master' into install-guide-improvementsSytse Sijbrandij2013-06-214-87/+115
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/install/installation.md
| * | | | Make the installation guide easier to follow for non-unix people.Sytse Sijbrandij2013-06-121-1/+1
| | | | |
| * | | | When stopped correctly there should be no warning about a missing socket file.Sytse Sijbrandij2013-06-121-1/+1
| | | | |
* | | | | You should not be able to remove a Group ownerDmitriy Zaporozhets2013-06-221-0/+16
| | | | |
* | | | | Markdown now support users from groupsDmitriy Zaporozhets2013-06-221-1/+1
| | | | |
* | | | | Classic (mars) theme will be default for 6.0Dmitriy Zaporozhets2013-06-201-5/+11
| | | | |
* | | | | Migrate global project taks. Removed more teams related functionalityDmitriy Zaporozhets2013-06-191-3/+7
| | | | |
* | | | | Remove Global namespace from options. Prepared file for migration of global ↵Dmitriy Zaporozhets2013-06-191-0/+12
| | | | | | | | | | | | | | | | | | | | projects
* | | | | Remove all team resources except models. Move models to deprecated directoryDmitriy Zaporozhets2013-06-184-427/+0
| |/ / / |/| | |
* | | | Refactor grack auth module. Add git over http wiki supportDmitriy Zaporozhets2013-06-143-87/+106
| | | |
* | | | Add path blacklistDmitriy Zaporozhets2013-06-121-0/+9
|/ / /
* | | Fix inline diff issue. See #3150Dmitriy Zaporozhets2013-06-121-4/+3
| |/ |/|
* | cattr_accessor is not threadsafe!Dmitriy Zaporozhets2013-06-112-3/+3
| |
* | Merge pull request #4140 from amacarthur/restore-fixes-cleanDmitriy Zaporozhets2013-06-113-12/+22
|\ \ | | | | | | fixes for gitlab restore with non-standard backup and repo dirs
| * | Correction to restore expected current directoryAngus MacArthur2013-06-031-9/+14
| | |
| * | fixes for gitlab restore with non-standard backup and repo dirsAngus MacArthur2013-05-303-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | These fixes will allow a restore of gitlab when the backups and repositories directories are in non-standard locations (ie sub-dirs of gitlabhq). Also allows the restore to be run from script overriding the need of a user to confirm the rebuild of the authorized_keys file.
* | | Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-checkDmitriy Zaporozhets2013-06-112-3/+3
|\ \ \ | |_|/ |/| | Fix abort gitlab:app:check
| * | Fix abort gitlab:app:checkSato Hiroyuki2013-06-062-3/+3
| | | | | | | | | | | | | | | | | | | | | When the file that pointed git bin_path in gitlab.yml dose'nt exist, bundle rake gitlab:app:check would be aborted. refs #4205
* | | Merge pull request #4260 from dosire/pygments-nameDmitriy Zaporozhets2013-06-091-1/+2
|\ \ \ | | | | | | | | Fix pygment lexer 500 errors when an alias is used instead of a name.
| * | | Fix pygment lexer 500 errors when an alias is used instead of a name.Sytse Sijbrandij2013-06-091-1/+2
| | | |
* | | | API: project eventsDmitriy Zaporozhets2013-06-062-0/+20
| | | |
* | | | API: Add last_activity_at date to project entityDmitriy Zaporozhets2013-06-061-1/+1
| | | |
* | | | Merge pull request #4204 from axilleas/initd_check-fixDmitriy Zaporozhets2013-06-061-1/+3
|\ \ \ \ | | | | | | | | | | Read init script recipe from Rails.root path. Fix #4174
| * | | | Read init script recipe from Rails.root path. Fix #4174Axilleas Pipinellis2013-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
* | | | | API: implement retrieve of repository treeDmitriy Zaporozhets2013-06-061-0/+25
| | | | |
* | | | | API: Fix repository commits paginationDmitriy Zaporozhets2013-06-061-1/+1
| | | | |