deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2351 commits 6 branches 43 tags 25 MiB
Commit graph

2351 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert Speicher 5dcca7e480 Remove some JS that is no longer used 2012-09-09 07:28:42 -04:00
Robert Speicher 3551df8eb1 Minor main.js refactor and docs 2012-09-09 07:28:41 -04:00
Robert Speicher ad1aa517c7 Add "enable" and "disable" jQuery functions 
Handles (un)setting the disabled attribute and adding/removing the
'disabled' class
 2012-09-09 07:28:41 -04:00
Robert Speicher 3b89f14090 Convert main.js to coffee 
Remove duplicate 's' hotkey code
 2012-09-09 07:28:41 -04:00
Robert Speicher 93daa8c568 Move main.js to main.js.coffee 2012-09-09 07:28:41 -04:00
Robert Speicher 1c01536829 Fix spelling of "empty" in disableButtonIfEmptyField function name 2012-09-09 07:28:41 -04:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
Dmitriy Zaporozhets ebd2a5d0ce Merge pull request #1387 from miks/project_users_api 
Project users api
 2012-09-09 01:18:46 -07:00
Dmitriy Zaporozhets 911c06c14c Merge pull request #1408 from myung/master 
Fix for enable automerge
 2012-09-08 15:28:12 -07:00
miks ba584c7d8d Merge branch 'master' into project_users_api 2012-09-08 20:55:08 +03:00
Dae Myung 8559d9a156 sending argument project but there is no project to send 2012-09-08 04:24:38 -07:00
Robert Speicher 1814ee0ced Give github-markup gem a version requirement 2012-09-05 17:02:23 -04:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files 
Closes #1382
 2012-09-05 16:52:49 -04:00
Robert Speicher b78fd0c130 Add github-markup gem 2012-09-05 16:50:03 -04:00
randx b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
randx c48c0f95b2 Gitlab::Gitolite final fixes. Seems like all functionality is working correctly now 2012-08-29 00:33:19 +03:00
randx e8e8ca940b Fixed access to removed method 2012-08-29 00:19:34 +03:00
randx d6b2b4f069 fixed configure call within gitolite 2012-08-29 00:16:33 +03:00
randx 5d88cdd9b8 Merge branch 'refactor/githost' 2012-08-29 00:07:57 +03:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Dmitriy Zaporozhets aded7056fd Merge pull request #1313 from LeonB/master 
Fixed some hardcoded paths based on issue #1272
 2012-08-28 07:00:55 -07:00
LeonB ffdda12f66 Line not needed anymore 2012-08-28 14:18:49 +02:00
LeonB 05fa1f167c Added hooks_path option example 2012-08-28 13:06:05 +02:00
Dmitriy Zaporozhets aa708ed961 Simplify setup for nginx, initd with already predefined files 2012-08-28 13:47:13 +03:00
Dmitriy Zaporozhets 4fe438ce63 Merge pull request #1315 from fixe/patch-2 
Fixed typo
 2012-08-28 03:09:43 -07:00
Tiago Ribeiro 7a16572c0a Fixed typo 2012-08-28 12:09:10 +02:00
LeonB c81d4ab4a9 Fixed some hardcoded paths 
New config option: git_hooks_path
 2012-08-28 10:57:23 +02:00
Dmitriy Zaporozhets 04b2864b64 Merge pull request #1290 from riyad/improve-gfm-user-docs 
Improve GFM user docs
 2012-08-27 22:44:38 -07:00
Riyad Preukschas 1f1ce5fbd4 Revamp GFM user docs. 2012-08-27 21:20:26 +02:00
Riyad Preukschas 806695f491 Split and reformat markdown options and add refs to their docs. 
Also add hard_wrap option.
 2012-08-27 21:20:13 +02:00
Riyad Preukschas 58a581782b Update forms to show consistent link to GFM. 2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets 2e836fa428 Merge pull request #1274 from wiggle/bulk_permissions_tasks 
Rake tasks to assign permissions to users
 2012-08-27 11:50:26 -07:00
Dmitriy Zaporozhets 607be412d4 Merge pull request #985 from timspin/fix-gitolite-refs 
Adds refs to gitolite.conf with $ at the end
 2012-08-27 11:13:13 -07:00
Dmitriy Zaporozhets cb35a80e49 Merge pull request #993 from veprbl/fix_archiving_prefix 
Download button: put files into a directory
 2012-08-27 11:04:00 -07:00
Dmitriy Zaporozhets cb6fcb6562 Merge pull request #1301 from Mikulas/help-web-hooks-typo 
fix web hooks help view commit count off by one
 2012-08-27 04:58:32 -07:00
Dmitriy Zaporozhets 65444ba311 Merge pull request #1307 from purwandi/master 
use high quality icon on folder icon
 2012-08-27 01:33:06 -07:00
Dmitriy Zaporozhets cdefad8887 Merge pull request #1305 from AlexDenisov/project_access_notifications 
Project access notifications
 2012-08-26 23:40:55 -07:00
Purwandi 28cc4de267 Replace folder icon to use high quality 2012-08-27 12:43:28 +07:00
Alex Denisov 3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
randx 867f46076e No need to chown hooks in backup script any mroe 2012-08-26 01:40:01 +03:00
randx 2c32574ac3 Project git clone panel 2012-08-25 23:39:01 +03:00
Dmitriy Zaporozhets efde86537a Merge pull request #1110 from gliptak/patch-1 
Display configured git repository location on error page
 2012-08-25 13:04:41 -07:00
Dmitriy Zaporozhets 79e936e632 Merge pull request #1300 from tsigo/spec_reorganize 
Spec cleanup/reorganization
 2012-08-25 13:03:44 -07:00
Mikuláš Dítě e0cd807020 fix web hooks help view commit count off by one 2012-08-25 20:48:30 +02:00
Robert Speicher 580ce4f2d8 Minor cleanup to Milestone model and spec 
Back-ported from my still-in-progress major cleanup.
 2012-08-25 14:19:16 -04:00
Robert Speicher 232389f4e8 Clean up request specs 2012-08-25 14:19:15 -04:00
Robert Speicher b2a5344a2d Add a simple api method to ApiHelpers, replacing api_prefix 
See docs for usage
 2012-08-25 14:19:15 -04:00
Robert Speicher fba174e9bc Cleanup spec/support folder and spec/spec_helper 
Changes:
* Move spec/monkeypatch to spec/support
* Remove unused support/shared_examples
* Move support/api to support/api_helpers to match module name
* Move support/login to support/login_helpers to match module name
* Move API specs to requests/api (convention over configuration)
* Remove unused support/js_patch
* Simplify login_as helper
* Move DatabaseCleaner stuff to its own support file
* Remove unnecessary configuration and requires from spec_helper
 2012-08-25 14:19:15 -04:00
randx 6ff0652e9e Admin area -> user form 2012-08-25 20:31:19 +03:00