Sebastian Ziebell
3f4e215c80
Extracted helper method to avoid code duplication
2013-02-06 17:02:30 +01:00
Sebastian Ziebell
413952ff94
Creating or updating a MR returns more informative status codes.
...
Using the API library to create or update a merge request at the moment a 404 error is returned.
This is fine when the merge request in question does not exist, but does not provide good
information that for example a required attribute is missing.
A status code of 400 (Bad request) is returned when creating or updating a merge request
when either `source_branch` or `target_branch` is missing. A status code of 409 is returned
when `source_branch` and `target_branch` are the same. Tests are added for these cases.
2013-02-06 16:57:00 +01:00
Dmitriy Zaporozhets
4bfb98ddc9
Merge pull request #2877 from former03/feature_groups_api
...
Add groups api
2013-02-06 03:19:29 -08:00
Dmitriy Zaporozhets
18fc090052
remove hooks and support scripts from main repo. Moved to gitlab-shell
2013-02-05 15:59:40 +02:00
Dmitriy Zaporozhets
bd3288e320
api check call
2013-02-05 15:55:49 +02:00
Dmitriy Zaporozhets
adfd36f26a
no need to run gitolite for enable_automerge
2013-02-05 13:30:56 +02:00
Sato Hiroyuki
9dccecc9b5
Sort the commits on network graph by commiter date.
...
Author date is not updated, if the commits is rebased.
So the network graph having many rebased commit turns round and round,
that it is very difficult to undarstand history.
2013-02-05 19:58:49 +09:00
Dmitriy Zaporozhets
70e3bffd95
Fixed: post-receive, project remove, tests
2013-02-05 12:47:50 +02:00
Sato Hiroyuki
df85c9c06a
Fix bug when it has been switched to tag.
2013-02-05 19:08:25 +09:00
Dmitriy Zaporozhets
39e37677f2
add remove keys from gitlab-shell by id
2013-02-05 11:12:15 +02:00
Dmitriy Zaporozhets
081c272b85
Remove outdated specs and fixed key remove
2013-02-05 10:15:49 +02:00
Sato Hiroyuki
81cc1cb87b
Enable to display the commit older than 650th commit.
2013-02-05 12:42:30 +09:00
Sato Hiroyuki
7812cb77c8
Fix typo.
2013-02-05 12:20:04 +09:00
Dmitriy Zaporozhets
935b6ae653
Internal API
2013-02-04 17:53:43 +02:00
Dmitriy Zaporozhets
6f7ccea668
Fix satellites to use filesystem. Correct post-receive user finder
2013-02-04 16:19:37 +02:00
Dmitriy Zaporozhets
27d9ac0fe8
Make gitlab works with gitlab-shell
2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets
6b9a609044
preparing for gitlab-shell
2013-02-04 14:28:10 +02:00
Christian Simon
33c48ecd35
Code deduplication using inheritance for GroupDetail
2013-02-03 19:38:33 +01:00
Cameron Yule
e0d62d9c5f
Replacing the manual parsing of the /etc/group file with the equivalent call from the Etc class in the Ruby standard library. This has the benefit of supporting additional platforms (e.g. OS X).
2013-02-02 20:04:07 +00:00
Riyad Preukschas
fac503877d
Port changes from #2803
2013-02-01 21:22:40 +01:00
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
