randx
1c5b2a5153
Stats page
2012-11-10 23:08:47 +02:00
Riyad Preukschas
ca54d43f99
Fix 500s because of "missing" lexer
2012-11-10 00:55:56 +01:00
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
Dmitriy Zaporozhets
ed899a2f4b
Replace sanitize with escape once
2012-09-20 11:50:22 +03:00
randx
6104942438
Sanitize for network graph
2012-09-20 09:06:12 +03:00
Robert Speicher
345c4d2a77
Update gfm so escaped text is still parsed for references
2012-09-19 20:21:35 -04:00
Saito
aaa916f15c
use high level api and compatibility with Passenger
2012-09-17 18:36:23 +08:00
Alex Denisov
c83af0dfe7
Uses attributes_for_keys
2012-09-16 22:44:20 +03:00
Alex Denisov
b6c6a5b159
Merge branch 'master' into ssh_keys_api
2012-09-16 22:37:50 +03:00
Alex Denisov
b896880eb4
Method name changed
2012-09-16 20:08:57 +03:00
Alex Denisov
549c4c2202
API attributes refactored
2012-09-16 19:51:04 +03:00
Alex Denisov
87d40fd276
Docs added
2012-09-16 18:21:59 +03:00
Alex Denisov
c23eb40829
SSH Keys API implemented
2012-09-16 17:52:06 +03:00
Robert Speicher
d993f66642
Fix HTML entities being parsed in GFM
...
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!
Closes #1308
2012-09-13 15:20:00 -04:00
Robert Speicher
0d77209ea0
Be more resilient in the case of missing omniauth settings
...
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets
3643df1f7c
Merge pull request #1411 from miks/project_hooks_api
...
Project hooks API
2012-09-12 12:16:35 -07:00
Dmitriy Zaporozhets
048d47e626
Refactorn oauth & ldap
2012-09-12 09:23:16 +03:00
randx
0523b4265b
Application logger
2012-09-11 23:24:53 +03:00
Dmitriy Zaporozhets
3f01ec2d5b
Merge pull request #1426 from NARKOZ/spinach
...
Cucumber => Spinach
2012-09-10 09:09:07 -07:00
miks
6d76e000d0
Add authorization to hooks requests
2012-09-10 16:50:01 +03:00
miks
2e34a6d3c4
Merge branch 'master' into project_hooks_api
2012-09-10 16:47:31 +03:00
Nihad Abbasov
ae9689f8ff
remove cucumber completely
2012-09-10 06:40:57 -07:00
Alex Denisov
e68d0841be
Merge branch 'master' into api_errors_refactoring
2012-09-10 14:10:34 +03:00
Alex Denisov
a065557208
Common errors method added
2012-09-10 13:49:00 +03:00
Alex Denisov
915dac0055
Error throwing moved to api_helper
2012-09-10 10:41:46 +03:00
Cyril
e7f483f9f4
fix typo
2012-09-10 10:50:07 +02:00
randx
b565f33472
Auth for API
2012-09-10 09:06:11 +03:00
miks
3b5a90bdf6
Projects hooks API implemented
2012-09-08 20:51:12 +03:00
miks
27e4436507
Return empty body
2012-09-08 20:01:08 +03:00
miks
4226458faf
Merge branch 'master' into project_users_api
2012-09-08 10:50:24 +03:00
Riyad Preukschas
d661b893c5
Prevent gfm() to leak changes to the string supplied through the _text_ argument
2012-09-08 01:58:12 +02:00
Riyad Preukschas
ce3fb94939
Fix bug where parsing of emoji was unnecessarily dependent on @project being set
2012-09-08 01:11:44 +02:00
Riyad Preukschas
5348ee6278
Fix Ruby anti-pattern in Markdown
2012-09-07 22:14:17 +02:00
randx
e8f39a0a61
gitolite -> more exceptions
2012-09-07 20:43:51 +03:00
Dmitriy Zaporozhets
963746f978
Refactor gitolite_config
2012-09-07 09:15:30 +03:00
randx
b994a65fc3
change gitolite backend behaviour to prevent error when config directory removed
2012-09-07 15:36:40 +03:00
Dmitriy Zaporozhets
79021e674b
Split gitolite backend. Use gitolite_config methods moved to separate class
2012-09-07 08:16:29 +03:00
Dmitriy Zaporozhets
137594dd08
Merge pull request #1339 from chopmann/fix-import_bulk
...
fix bulk_import for #1309
2012-09-07 00:44:44 -07:00
randx
5cb9e7eedc
Fix emojii
2012-09-07 09:16:04 +03:00
Dmitriy Zaporozhets
4f8a4aa44c
Merge pull request #1384 from tsigo/emoji
...
Emoji!
2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets
7c0a1068bf
Merge pull request #1363 from AlexDenisov/api_create_project_fixes
...
API create project fixes
2012-09-06 23:00:04 -07:00
miks
909c8c345d
Make project users API more RESTful
2012-09-06 23:49:29 +03:00
Robert Speicher
3a63f6f316
Simplify EMOJI_PATTERN
2012-09-06 15:26:55 -04:00
Robert Speicher
8808c5fa8d
Merge branch 'master' into emoji
2012-09-06 15:23:42 -04:00
Alex Denisov
09a86bd4d6
Capitlization of /gitlab/i normalized. #1367
2012-09-06 11:21:35 +03:00
Cornelio
b3c8688da3
fix bulk_import for #1309
2012-09-06 08:56:46 +02:00
miks
e3b1f62c6b
convert params hash to array
2012-09-06 00:13:25 +03:00
Robert Speicher
b3bbf53e9b
Set the size of emoji to be 20x20
...
Forgot they were so big!
2012-09-05 16:14:54 -04:00
Robert Speicher
67a6a0b29b
Change Gitlab::Markdown to a module; add emoji parsing
2012-09-05 16:07:39 -04:00
miks
8f7360f390
API on adding users to project implemented
2012-09-05 23:01:03 +03:00
Alex Denisov
9b9dd3f9bf
Unnecessary code removed
2012-09-05 11:44:47 +03:00
