Riyad Preukschas
42dd006dfc
Small fixes to the installation guide and check task
2013-02-01 21:06:44 +01:00
Riyad Preukschas
003c312104
Merge pull request #2440 from klamontagne/master
...
Don't setuid the repositories on installation
2013-02-01 20:56:03 +01:00
Christian Simon
149ccd5d91
Fix groups api: differ between users and admin
2013-02-01 15:00:12 +01:00
Felix Gilcher
ce6436b98a
Don't crash when removing a user that's not project member
...
The attempt to revoke project access for a user that was not member of the
project results in a 500 Internal Server error where it actually should
result in a 200 OK since after the operation, the user is not member of
the project. This turns the operation into an idempotent call that can
be repeated with no ill effects.
Updated the spec and changed the code accordingly. However, the result differs
slightly, as we can't return the users project access level if the user was not
member. I'm not aware if anybody relies on the result of this call.
Fixes #2832
2013-02-01 13:53:35 +00:00
Christian Simon
8edc6b6a8c
Add api for creating/listing/viewing groups
2013-02-01 12:11:19 +01:00
Felix Gilcher
c72910a8bf
log fatal errors that we catch
...
In case we rescue from a fatal error, we want the error and the backtrace to
the error logged, so we can debug later on. This change injects the configured
logger from the rails app to the grape API and logs error as well as backtrace
in a rails-like fashion.
2013-02-01 10:23:23 +00:00
Dmitriy Zaporozhets
5857a7a9ce
Merge pull request #2839 from m4tthumphrey/protected-branches-api
...
Added methods to protect and unprotect branches in from the API
2013-01-31 10:44:20 -08:00
Dmitriy Zaporozhets
fd1b9fdc12
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api
...
Conflicts:
spec/requests/api/users_spec.rb
2013-01-31 13:00:50 +02:00
Dmitriy Zaporozhets
56000aea22
Merge pull request #2855 from hiroponz/fix-bug-of-network-graph
...
Fix bug of network graph(#2847 ) and trivial code clean up.
2013-01-31 02:33:59 -08:00
Matt Humphrey
2c7554e897
Added methods to protect and unprotect branches
2013-01-31 09:26:03 +00:00
Sato Hiroyuki
4133221200
Fix bug of network graph( #2847 ) and trivial code clean up.
2013-01-31 17:48:51 +09:00
Dmitriy Zaporozhets
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets
a037c9c249
Merge pull request #2842 from inome/ExposeMergeRequestAsNotable
...
Expose MergeRequest object as a notable in the API to allow for easy ret...
2013-01-30 22:25:02 -08:00
Dmitriy Zaporozhets
d46cb3fd1c
Merge pull request #2847 from hiroponz/improve-overlap-lines
...
Improve overlap of lines in network graph
2013-01-30 22:22:37 -08:00
Sato Hiroyuki
59b6de93ce
Improve overlap of lines in network graph
2013-01-30 23:48:00 +09:00
Micah Huff
1694dc8fe2
Expose MergeRequest object as a notable in the API to allow for easy retrieval of comments
2013-01-29 21:15:13 -08:00
Sato Hiroyuki
525a8cd3e9
Switchable the main branch on network graph
2013-01-30 09:12:03 +09:00
Felix Gilcher
2a669fc899
rescue all errors and return the proper format
...
This rescues all errors and returns a proper JSON response. Fixes #2833 .
2013-01-29 18:20:59 +01:00
Dmitriy Zaporozhets
c84675ee06
satellites logs
2013-01-29 12:12:24 +02:00
Dmitriy Zaporozhets
299a9a1040
keys to gitolite via sidekiq now
2013-01-28 21:02:10 +02:00
Dmitriy Zaporozhets
944b2450b1
Merge pull request #2801 from Takuto88/master
...
Fix #2790
2013-01-28 10:33:59 -08:00
Dmitriy Zaporozhets
8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets
1c5876eb7b
Do gitolite calls async. Remove satellite with project remove
2013-01-28 17:22:45 +02:00
Lennart Rosam
f9a48f72d4
Fix issue #2790
2013-01-28 13:52:30 +01:00
Lennart Rosam
66ebf8d83f
Merge remote-tracking branch 'github/master'
2013-01-28 13:04:23 +01:00
Lennart Rosam
dc13af90b1
Fix rake task - Update method name
2013-01-28 12:54:07 +01:00
Dmitriy Zaporozhets
552e42f634
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
...
Updates web hooks to process via queue
2013-01-27 08:52:37 -08:00
Alex Denisov
6ab6c55de5
Missed environment added to 'Try fixing it' block
2013-01-26 14:22:48 +00:00
Ryan LaNeve
8a65229b35
Updates project to process web hooks async via sidekiq.
...
A new queue of "project_web_hook" is used to process web hooks asynchronously, allowing each to succeed/fail (and be retried) independently.
(Basically, project web hooks now process the same as system hooks.)
2013-01-25 10:42:57 -05:00
Dmitriy Zaporozhets
639b0a8715
refactor add to team
2013-01-25 17:26:00 +02:00
Dmitriy Zaporozhets
5f3df89c64
Fix teams + gitolite access
2013-01-25 17:18:27 +02:00
Dmitriy Zaporozhets
2812e6f1f5
Fix removeing project if repo not exists
2013-01-25 13:47:54 +02:00
Andrey Kumanyaev
b7470440ff
Move team project management to own controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
9804b7df68
Move admin team members management to own controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
360aa1b407
Team core management
2013-01-24 22:31:24 +02:00
Dmitriy Zaporozhets
d9027df5b5
Merge pull request #2706 from jfut/gh-issue-2602
...
Remove relative_url_root from path. Fixes #2602
2013-01-23 10:14:28 -08:00
Sato Hiroyuki
70687cd581
Improve network graph
2013-01-23 21:39:29 +09:00
Jun Futagawa
79b9249ff4
Remove relative_url_root from path. Fixes #2602
...
Files and Commits render a 404 when running with relative_url_root.
2013-01-23 17:29:46 +09:00
Erwan Arzur
621ca86b9e
[import] - fix project import after refactoring
2013-01-22 19:07:11 +01:00
Dmitriy Zaporozhets
d770714578
Use subproccess instead subshell for git calls
2013-01-22 10:35:58 +02:00
Riyad Preukschas
47e510e14f
Small fixes
2013-01-19 15:26:55 +01:00
Dmitriy Zaporozhets
cb96cc030a
Uncomment forgotten code
2013-01-19 13:57:50 +02:00
Dmitriy Zaporozhets
54a24608a2
Remove chdir inside runtime. Improved gitolite shell commands
2013-01-19 13:56:55 +02:00
Dmitriy Zaporozhets
569a88a456
raise exception if gitolite is broken
2013-01-19 11:58:36 +02:00
Dmitriy Zaporozhets
5c3fdfaacb
Fixed developer push to protected branch. Closes #2647
2013-01-19 11:11:25 +02:00
Kevin Lamontagne
f4175219fb
Fix gitlab:check recommendation
...
Running the recommendation would give out:
GNU find: paths must precede expression
2013-01-18 14:14:32 -05:00
Dmitriy Zaporozhets
6f05ea4f6e
Improve CreateContext call. Fixed test
2013-01-18 20:21:13 +02:00
GitLab
232d61d598
Refactor project creation. Added logout link to profile page
2013-01-17 17:35:57 +02:00
Riyad Preukschas
65c35466b6
Rename gitlab:app:setup task to gitlab:setup
2013-01-17 21:26:22 +01:00
Riyad Preukschas
bc59fd046f
Add a warning prompt to the setup task
2013-01-17 21:19:36 +01:00
