Saito
6cec9ed328
linguist will take care of this
2012-11-10 01:36:55 +08:00
David Barri
944d3823c3
Fix for git commit when nothing to commit.
...
Turns out git commit returns with 128 when user.name config not present.
2012-11-09 08:32:00 +11:00
Saito
f1ac2a616b
remove encode lib, clean all encoded area.
2012-11-09 01:41:07 +08:00
David Barri
6f25967c47
Fixed issue with git commit silently failing.
...
Also updated status task and installation instuctions.
2012-11-08 10:47:11 +11:00
Valeriy Sizov
d6a5e3dad7
Merge pull request #1735 from NARKOZ/api
...
API fixes
2012-11-07 03:50:42 -08:00
Valeriy Sizov
0d4568db78
gitolite custom config
2012-11-07 00:47:33 +02:00
Dmitriy Zaporozhets
f555578414
Added EventFilter class. Compeleted first version of dashbaord filtering
2012-11-05 20:12:26 +02:00
randx
dd4d124832
remove accidently created file
2012-11-04 23:44:58 +02:00
randx
f082c8ae2a
Decouple and refactor GraphCommit
2012-11-04 23:43:33 +02:00
Dmitriy Zaporozhets
2032f4cd96
Fix tests fail cause of issue with grit stub
2012-10-31 15:22:13 +02:00
Dmitriy Zaporozhets
37e39e4176
Added bare import script. Removed old unworking script
2012-10-30 13:04:56 +02:00
Dmitriy Zaporozhets
50a6c614b5
Merge pull request #1818 from riyad/refactor-satellite-actions
...
Refactor Satellite Code
2012-10-29 04:12:26 -07:00
Michele Franzin
c370c1b389
gitolite's repositories folder symlinked patch
2012-10-27 16:12:01 +02:00
randx
72f984e3d3
Prevent grit from caching graph commits
2012-10-26 21:52:26 +03:00
Saito
4f687aaa8e
Merge pull request #1827 from mgrobelin/master
...
grack auth bugfix: allow dots in reponame
2012-10-26 06:35:37 -07:00
Markus Grobelin
bd50a9f466
grack: allow repositories to have dots in name, e.g. serverconfigs-example.com.git
2012-10-26 14:05:57 +02:00
Riyad Preukschas
904615c150
Update satellite action docs
2012-10-26 02:50:24 +02:00
Riyad Preukschas
7192f86ed0
Fix Satellite#lock
2012-10-26 02:32:17 +02:00
Riyad Preukschas
700a784bc9
Refactor EditFileAction#update and rename it to commit!
2012-10-26 01:59:50 +02:00
Riyad Preukschas
3080127354
Fix timeouts in MergeAction
2012-10-26 01:44:50 +02:00
Riyad Preukschas
0ebcc60a33
Move locking from Satellite::Action to Satellite and add checks
2012-10-26 01:44:20 +02:00
Riyad Preukschas
0e9d4f30f4
Refactor Satellite#clear and rename it to clear_and_update!
2012-10-26 01:32:33 +02:00
Riyad Preukschas
fba8ad5607
Move Gitlab::Satellite into the Satellite module
2012-10-26 00:56:24 +02:00
Riyad Preukschas
5f16687805
Update arguments for Gitlab::Satellite::EditFileAction#initialize
2012-10-26 00:39:23 +02:00
Riyad Preukschas
55779b00ea
Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction
2012-10-26 00:33:53 +02:00
Riyad Preukschas
8c89beb6f9
Change argument order for satellite actions to always start with the user
2012-10-26 00:26:47 +02:00
Riyad Preukschas
35b7a53955
Reorder methods in Gitlab::Satellite
2012-10-26 00:24:16 +02:00
Riyad Preukschas
8778961d33
Move prepare_satellite! to Gitlab::Satelite::Action
2012-10-26 00:24:02 +02:00
Riyad Preukschas
78235edda8
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
2012-10-26 00:19:01 +02:00
Riyad Preukschas
847bba9269
Add Gitlab::Satellite::Action
2012-10-26 00:10:40 +02:00
Riyad Preukschas
643ed9cbf3
Fix typos in Gitlab::Merge
2012-10-25 23:49:49 +02:00
Valeriy Sizov
4281de3640
API: review 2
2012-10-25 13:38:55 +03:00
Valeriy Sizov
e6cdfb607a
API: tests for merge_requests
2012-10-25 13:13:01 +03:00
Valeriy Sizov
77bc110107
API: help page and comment
2012-10-22 23:09:21 +03:00
Valeriy Sizov
6ffd2f3db6
Changes after review
2012-10-22 23:09:21 +03:00
Valeriy Sizov
93e8d426c5
API: merge request: post comment call
2012-10-22 23:09:21 +03:00
Valeriy Sizov
b32a8eea93
API: MergeRequest: authorization
2012-10-22 23:09:21 +03:00
Valeriy Sizov
524b907042
API: MergeRequest refactoring
2012-10-22 23:09:21 +03:00
Valeriy Sizov
5a89934af8
API: update merge request call
2012-10-22 23:09:21 +03:00
Valeriy Sizov
fe59547ae5
API: create merge request
2012-10-22 23:09:21 +03:00
Valeriy Sizov
bd049e5e7c
API:merge request show && list
2012-10-22 23:09:21 +03:00
Dmitriy Zaporozhets
893ce9ae24
Fix git over HTTP
2012-10-22 18:45:42 +03:00
randx
351b0e758b
Log OutOfMemory exceptions from Merge Requests with GitLogger
2012-10-21 20:29:19 +03:00
Dmitriy Zaporozhets
fb903de508
Merge pull request #1740 from godric7/master
...
Enable Oauth login for existing regular users
2012-10-21 09:13:35 -07:00
randx
0189ee97ed
Security for online editor. Replace dev_access?, master_access? with can? method usage
2012-10-21 12:12:14 +03:00
Riyad Preukschas
122769e358
Refactor Gitlab::Merge
...
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
2012-10-20 15:25:48 +02:00
Godric
054c15e7b5
enable Oauth login for existing regular users
...
fix: https://github.com/gitlabhq/gitlabhq/issues/1620
2012-10-20 00:38:07 +03:00
Nihad Abbasov
00325a733a
name and password_confirmation not required to create a user via API
2012-10-19 03:34:18 -07:00
Nihad Abbasov
c610206321
fix mass-assignment error in user create API
2012-10-19 03:23:10 -07:00
Dmitriy Zaporozhets
c007325451
Merge pull request #1712 from riyad/use-gem-for-emoji
...
Use gem for Emoji
2012-10-18 00:28:47 -07:00
Riyad Preukschas
ce91014730
Fix use of Emoji
2012-10-18 01:10:35 +02:00
Riyad Preukschas
5d42d92c87
Remove old Emoji code and images
2012-10-18 01:10:35 +02:00
Valeriy Sizov
883d138f15
Fix 500 error when project is empty
2012-10-17 23:59:42 +03:00
Valeriy Sizov
7a0a552b43
revert
2012-10-17 15:21:16 +03:00
Valeriy Sizov
31f1cebe4b
Wiki style: move styles to right place
2012-10-17 15:17:27 +03:00
Valeriy Sizov
d8262573b8
Merge pull request #1719 from SaitoWu/features/sharedRepository
...
add shared repository support
2012-10-17 02:27:40 -07:00
Saito
83626d05cd
add shared repository support
2012-10-17 15:43:44 +08:00
Riyad Preukschas
f120e5a89a
Use shorthand as in TreeController#edit
2012-10-15 23:40:23 +02:00
randx
809aefb828
Minor improve to UI and code formatting of gitlab web editor
2012-10-15 19:51:11 +03:00
Valeriy Sizov
42bdfd021b
WebEditor: base implementation
2012-10-12 20:07:24 +03:00
Valeriy Sizov
0b3e9fd218
WebEditor: Check if save is possible
2012-10-12 20:07:24 +03:00
Valeriy Sizov
e53b47b447
WebEditor: sceleton
2012-10-12 20:07:24 +03:00
jozefvaclavik
d1a18d038d
Update lib/api/projects.rb
...
Added methods for listing one project hook and editing hooks.
GET /project/:id/hooks/:hook_id
PUT /project/:id/hooks/:hook_id
2012-10-12 10:30:09 +03:00
Valeriy Sizov
a54a90188b
remove unnecessary task
2012-10-09 14:59:58 +03:00
Andrey Kumanyaev
03836cc591
fix resque start
2012-10-09 00:19:07 +04:00
Nihad Abbasov
61f12da3a5
API: add project snippets listing
2012-10-08 02:13:53 -07:00
Nihad Abbasov
ad5b5d1e51
projects API should return info about deleted hook
2012-10-08 01:54:50 -07:00
Nihad Abbasov
d2ea858fbf
move emoji module to lib
2012-10-05 07:42:23 -07:00
Nihad Abbasov
317c928198
improve emoji checking performance
2012-10-05 07:23:58 -07:00
Robert Speicher
3606a14889
ExtractsPath: Use ref_names instead of branches+tags
2012-10-04 14:13:52 -04:00
Valeriy Sizov
e25ddca0c4
Fix bug with branches whose name contains slash
2012-10-04 19:31:31 +03:00
Valeriy Sizov
bd5334abc2
fix inline diff
2012-10-04 13:28:58 +03:00
Dmitriy Zaporozhets
2985697af7
Real fix for removing keys. Closes PR #1616
2012-10-03 15:56:41 +03:00
Valeriy Sizov
e7608cd6f9
API: private token via header
2012-10-02 18:43:35 +03:00
Valeriy Sizov
2e1c3c52bc
#1606 Fixes
2012-10-02 18:08:04 +03:00
Valeriy Sizov
e9c356092b
#1606 API private token via the header
2012-10-02 18:02:21 +03:00
Valeriy Sizov
d104df49e7
fix TYPO
2012-10-02 16:34:20 +03:00
Valeriy Sizov
825081174a
#1585 Api for user creation: base implementation
2012-10-02 12:46:01 +03:00
Vincent Bonmalais
1fe45898d7
Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
...
When working inside of a Vagrant box with NFS enabled, the deletion of a
repository in tmp/ doesn't work every time.
It is related to NFS inability to delete a folder if it's still used by
a resource (e.g. `rm -rf ./folder` would leave the folder and a .nfs*
file in it). In this case it's the temporary repository which can't
be deleted because `ga_repo` is still using it.
De-allocating ga_repo is not possible (thanks Ruby), but deleting the
folder it points to in the first place fixes the issue.
Reference:
http://stackoverflow.com/questions/11228079/python-remove-directory-error-file-exists
2012-09-28 16:53:02 +10:00
Dmitriy Zaporozhets
3e9836ae1e
Merge pull request #1526 from namtzigla/dot-repos-names
...
changed the post-receive hook in order to push the correct repository
2012-09-27 10:22:33 -07:00
Robert Speicher
afc4a75499
Use Rails.root.join where appropriate
2012-09-26 16:32:26 -04:00
Robert Speicher
835be5b1bf
ExtractPaths - Only call assign_ref_vars on show action
2012-09-26 16:32:22 -04:00
Robert Speicher
a1e68a9120
Rename RefExtractor to ExtractsPath
...
Update docs a bit
2012-09-26 16:32:22 -04:00
Robert Speicher
a8ea8d98a4
Update RefExtractor to handle atom feeds
2012-09-26 16:32:22 -04:00
Robert Speicher
398ba6f1bb
DRY up Blame, Blob and Tree controllers
2012-09-26 16:32:22 -04:00
Robert Speicher
37f0b600bc
Another RefExtractor refactor
2012-09-26 16:32:22 -04:00
Robert Speicher
567767bcf2
Add ref_extractor helper module for upcoming controllers
2012-09-26 16:32:21 -04:00
Robert Speicher
b389247c02
Use Commit#show instead of Commits#show to view a single commit
...
Commits#show (plural) is going to be for showing commit history on a
specific path.
2012-09-26 16:32:21 -04:00
Nihad Abbasov
4629cc44d6
fix mass assignment error in create_from_omniauth after a6a229a
2012-09-26 11:18:25 -07:00
Nihad Abbasov
83696b127b
cleanup rake tasks
2012-09-26 04:18:10 -07:00
Florin Stan
6424fc715b
changed the post-receive hook in order to push the correct repository name when the name contain special characters
2012-09-21 13:02:59 -06:00
Nihad Abbasov
b62445813d
API: SSH keys belong to user entity
2012-09-21 04:49:28 -07:00
Nihad Abbasov
4a072be2d7
API: commits belong to project repository
2012-09-21 04:34:07 -07:00
Dmitriy Zaporozhets
131553627d
Merge pull request #1521 from NARKOZ/api
...
API for project team members
2012-09-21 04:19:16 -07:00
Nihad Abbasov
25b745271a
add API for project team members
2012-09-21 03:23:17 -07:00
Dmitriy Zaporozhets
10d3a30b25
APi for commits. Better api docs
2012-09-21 13:22:30 +03:00
Nihad Abbasov
b08d33f6a9
API: return 401 for invalid session
2012-09-20 08:38:08 -07:00
Nihad Abbasov
3dd940d4cb
API: extend UserLogin entity from UserBasic
2012-09-20 08:36:43 -07:00
Dmitriy Zaporozhets
9aafe77e70
I want be able to get token via api. Used for mobile applications
2012-09-20 17:45:07 +03:00
Nihad Abbasov
37817cc31d
API: expose project id for milestones
2012-09-20 18:38:34 +06:00