OSDN Git Service
Sebastian Ziebell [Wed, 6 Feb 2013 15:34:06 +0000 (16:34 +0100)]
Status code 400 is returned if body is missing on note creation.
If a note is created with a POST request via API (`/projects/:id/notes`) status
code 400 is returned instead of 404. The resource itself exists but the request
is incomplete. Specs added to check different status codes when accessing, creating
and updating notes.
Sebastian Ziebell [Wed, 6 Feb 2013 14:05:56 +0000 (15:05 +0100)]
Tests added to check status codes when handling milestone via API
A few more tests added to check status code when creating or updating milestones.
Sebastian Ziebell [Wed, 6 Feb 2013 14:03:05 +0000 (15:03 +0100)]
Status code 400 returned if title not given in a milestone (via API)
If a milestone is created via API but no title given then status code 400 (Bad request)
is returned instead of 404. A small helper method handles the errors collection of a
milestone.
Sebastian Ziebell [Wed, 6 Feb 2013 13:59:47 +0000 (14:59 +0100)]
Test added to check creation of note to a non-existent MR via API
Sebastian Ziebell [Tue, 5 Feb 2013 17:37:44 +0000 (18:37 +0100)]
Creating MR comment without a note returns status code 400 (Bad request)
Creating a comment to an existing merge request via API without providing a note
returns a status code 400 now, suggesting a bad request. The reason for this
is the resource itself (MR) exists but the required property is not set.
Sebastian Ziebell [Tue, 5 Feb 2013 17:36:36 +0000 (18:36 +0100)]
Extracted helper method to avoid code duplication
Sebastian Ziebell [Tue, 5 Feb 2013 16:13:47 +0000 (17:13 +0100)]
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.
Felix Gilcher [Fri, 1 Feb 2013 14:20:51 +0000 (14:20 +0000)]
update api documentation for delete team member
correctly describes the new behavior
Felix Gilcher [Fri, 1 Feb 2013 13:53:35 +0000 (13:53 +0000)]
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
Felix Gilcher [Fri, 1 Feb 2013 09:42:02 +0000 (09:42 +0000)]
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.
Felix Gilcher [Tue, 29 Jan 2013 17:20:59 +0000 (18:20 +0100)]
rescue all errors and return the proper format
This rescues all errors and returns a proper JSON response. Fixes #2833.
Dmitriy Zaporozhets [Tue, 29 Jan 2013 12:49:10 +0000 (14:49 +0200)]
set link to gitlab-ci
Dmitriy Zaporozhets [Tue, 29 Jan 2013 10:12:24 +0000 (12:12 +0200)]
satellites logs
Dmitriy Zaporozhets [Tue, 29 Jan 2013 09:32:05 +0000 (11:32 +0200)]
Advanced logging for post-receive worker
Dmitriy Zaporozhets [Tue, 29 Jan 2013 09:00:56 +0000 (11:00 +0200)]
dont escape images inside links for gfm. Fixes #2701
Dmitriy Zaporozhets [Mon, 28 Jan 2013 21:03:38 +0000 (23:03 +0200)]
fix key observer tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 19:02:10 +0000 (21:02 +0200)]
keys to gitolite via sidekiq now
Dmitriy Zaporozhets [Mon, 28 Jan 2013 18:33:59 +0000 (10:33 -0800)]
Merge pull request #2801 from Takuto88/master
Fix #2790
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:54:31 +0000 (15:54 +0000)]
Merge branch 'features/async_gitolite' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:53:01 +0000 (17:53 +0200)]
fix tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:46:24 +0000 (17:46 +0200)]
user factory username over sequence
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:39:02 +0000 (17:39 +0200)]
Async perform for add/remove team members
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:22:45 +0000 (17:22 +0200)]
Do gitolite calls async. Remove satellite with project remove
Lennart Rosam [Mon, 28 Jan 2013 12:52:30 +0000 (13:52 +0100)]
Fix issue #2790
Riyad Preukschas [Mon, 28 Jan 2013 12:47:00 +0000 (04:47 -0800)]
Merge pull request #2798 from Xylakant/patch-2
remove incorrect information about the api version
Lennart Rosam [Mon, 28 Jan 2013 12:04:23 +0000 (13:04 +0100)]
Merge remote-tracking branch 'github/master'
Lennart Rosam [Mon, 28 Jan 2013 11:54:07 +0000 (12:54 +0100)]
Fix rake task - Update method name
Felix Gilcher [Mon, 28 Jan 2013 09:59:39 +0000 (10:59 +0100)]
remove incorrect information about the api version
The API version is currently not equal to the gitlab major version number. Gitlab 4.1
still uses API version 3. Point to the lib/api.rb file instead which contains the
autoritative information.
Dmitriy Zaporozhets [Mon, 28 Jan 2013 06:59:34 +0000 (08:59 +0200)]
fix tests
Dmitriy Zaporozhets [Sun, 27 Jan 2013 19:41:23 +0000 (11:41 -0800)]
Merge pull request #2153 from koenpunt/commit-diff-views
Added swipe view for image diff
Koen Punt [Sat, 1 Dec 2012 12:49:21 +0000 (13:49 +0100)]
Updated commit diff view with some minor visual modifications
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
Dmitriy Zaporozhets [Sun, 27 Jan 2013 17:09:40 +0000 (19:09 +0200)]
Add deploy.html for symlink if maintaince
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:52:37 +0000 (08:52 -0800)]
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
Updates web hooks to process via queue
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:47:19 +0000 (18:47 +0200)]
Pager.js to coffee
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:55:22 +0000 (05:55 -0800)]
Merge pull request #2787 from gitlabhq/features/projects_page
Feature: Projects page
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:41:35 +0000 (15:41 +0200)]
feature tests
Dmitriy Zaporozhets [Sun, 27 Jan 2013 12:10:42 +0000 (14:10 +0200)]
Fix features
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:20:23 +0000 (13:20 +0200)]
Fixed dashboard show specs
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:12:30 +0000 (13:12 +0200)]
Make group name a link at header
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:56:20 +0000 (12:56 +0200)]
Dashboard to resource
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:34:27 +0000 (12:34 +0200)]
Add projects page to dashboard. Remove projects pagination on dashboard
Riyad Preukschas [Sat, 26 Jan 2013 19:51:17 +0000 (11:51 -0800)]
Merge pull request #2784 from AlexDenisov/gitlab_check_environment
Missing environment added to 'Try fixing it' block
Alex Denisov [Sat, 26 Jan 2013 14:22:48 +0000 (14:22 +0000)]
Missed environment added to 'Try fixing it' block
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:15:38 +0000 (12:15 +0200)]
Fix projects in admin -> user -> show
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:08:34 +0000 (12:08 +0200)]
Fix application crashes after #2772
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:45:08 +0000 (13:45 -0800)]
Merge pull request #2772 from zzet/bugfix/path_and_page-project-member-access-#2745
fix edit project members access link and page fixes refs #2745
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:42:52 +0000 (13:42 -0800)]
Merge pull request #2777 from zzet/add_project_button
Add assign project to team button on team page
Andrey Kumanyaev [Fri, 25 Jan 2013 21:14:36 +0000 (01:14 +0400)]
Display actual user role (admin or not) in team members list
Andrey Kumanyaev [Fri, 25 Jan 2013 20:38:21 +0000 (00:38 +0400)]
Edit create new team text
Andrey Kumanyaev [Fri, 25 Jan 2013 20:37:55 +0000 (00:37 +0400)]
fix copied code. Add assign projects button.
Andrey Kumanyaev [Fri, 25 Jan 2013 19:19:31 +0000 (23:19 +0400)]
simple cleanup code %)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:38:24 +0000 (22:38 +0400)]
rewrite admin users controller (use 1 variable and find by username)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:37:38 +0000 (22:37 +0400)]
fix links in admin group view page (user links)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:58 +0000 (22:35 +0400)]
username is default param to User
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:31 +0000 (22:35 +0400)]
Update user finding (by username) in teams members (team of users) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:34:49 +0000 (22:34 +0400)]
Update user finding (by username) in teams_members (project team) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:33:49 +0000 (22:33 +0400)]
Update user finding (by username) in admin teams members controller
Andrey Kumanyaev [Fri, 25 Jan 2013 17:20:15 +0000 (21:20 +0400)]
fix edit project members access link and page fixes refs #2745
Dmitriy Zaporozhets [Fri, 25 Jan 2013 16:24:22 +0000 (08:24 -0800)]
Merge pull request #2769 from hiroponz/fix-not-showing-tooltip
Fix not showing tooltip on network graph
Sato Hiroyuki [Fri, 25 Jan 2013 15:52:11 +0000 (00:52 +0900)]
Fix not showing tooltip on network graph
Ryan LaNeve [Thu, 24 Jan 2013 20:15:24 +0000 (15:15 -0500)]
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.)
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:26:00 +0000 (17:26 +0200)]
refactor add to team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:18:27 +0000 (17:18 +0200)]
Fix teams + gitolite access
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:36:14 +0000 (16:36 +0200)]
teams refactoring and cleanup pt.1
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:25:43 +0000 (16:25 +0200)]
show new group, new team links in profile
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:18:37 +0000 (16:18 +0200)]
Fix redirects. Add link to new team and new group
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:51:45 +0000 (15:51 +0200)]
Fix security issues with teams
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:42:41 +0000 (15:42 +0200)]
Fix mass-assignment. Dont allow users w/o access to create team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:36:10 +0000 (15:36 +0200)]
fix User.potential_team_members
Dmitriy Zaporozhets [Fri, 25 Jan 2013 12:18:23 +0000 (14:18 +0200)]
fix 1145
Dmitriy Zaporozhets [Fri, 25 Jan 2013 11:56:04 +0000 (13:56 +0200)]
Fix project adding to team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 11:47:54 +0000 (13:47 +0200)]
Fix removeing project if repo not exists
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:36:15 +0000 (11:36 +0200)]
Fixing team tests
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:30:49 +0000 (11:30 +0200)]
allow/deny user to create group/team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:08:22 +0000 (11:08 +0200)]
can_create_group, can_create_team boolean fields for user
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:46:20 +0000 (00:46 -0800)]
Merge pull request #2746 from gitlabhq/features/teams
New feature: Teams
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:16:20 +0000 (10:16 +0200)]
Fix for broken commit_url in graph
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:10:12 +0000 (10:10 +0200)]
fix spec
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:07:21 +0000 (10:07 +0200)]
Improved search. added filters
Andrey Kumanyaev [Thu, 24 Jan 2013 18:31:28 +0000 (22:31 +0400)]
Remove simple code duplication in members controllers
Andrey Kumanyaev [Thu, 24 Jan 2013 18:19:18 +0000 (22:19 +0400)]
Update check If user can assign project to team
Andrey Kumanyaev [Thu, 24 Jan 2013 18:18:43 +0000 (22:18 +0400)]
remove unused code
Dmitriy Zaporozhets [Thu, 24 Jan 2013 12:15:14 +0000 (14:15 +0200)]
Reject non-owned projects to assign to teams
Dmitriy Zaporozhets [Thu, 24 Jan 2013 12:10:17 +0000 (14:10 +0200)]
Dont allow to select a project you have no right to assign
Dmitriy Zaporozhets [Thu, 24 Jan 2013 11:39:00 +0000 (13:39 +0200)]
move team navs to upper nav
Dmitriy Zaporozhets [Thu, 24 Jan 2013 09:43:09 +0000 (11:43 +0200)]
Make a team and group boxes smaller on dashboard
Dmitriy Zaporozhets [Thu, 24 Jan 2013 09:19:09 +0000 (11:19 +0200)]
Fix mispelling and ambiguous id in UserTeam.without_project
Dmitriy Zaporozhets [Thu, 24 Jan 2013 08:39:16 +0000 (10:39 +0200)]
Show only teams we have access to
Dmitriy Zaporozhets [Thu, 24 Jan 2013 08:16:03 +0000 (10:16 +0200)]
Few UI improvements
Andrey Kumanyaev [Wed, 23 Jan 2013 23:18:07 +0000 (03:18 +0400)]
fix scope to empty relation
Andrey Kumanyaev [Wed, 23 Jan 2013 23:00:56 +0000 (03:00 +0400)]
Switch user link to profile link
Andrey Kumanyaev [Wed, 23 Jan 2013 21:40:45 +0000 (01:40 +0400)]
Remove save files with failed test %)
Andrey Kumanyaev [Wed, 23 Jan 2013 20:06:48 +0000 (00:06 +0400)]
Remove pending steps (no functional - no tests)
Andrey Kumanyaev [Wed, 23 Jan 2013 19:39:47 +0000 (23:39 +0400)]
fix tests
Andrey Kumanyaev [Wed, 23 Jan 2013 16:43:23 +0000 (20:43 +0400)]
simple refactoring
Andrey Kumanyaev [Wed, 23 Jan 2013 16:42:38 +0000 (20:42 +0400)]
remove unused autogenerated files
Andrey Kumanyaev [Wed, 23 Jan 2013 14:14:53 +0000 (18:14 +0400)]
Fix little bugs
Andrey Kumanyaev [Wed, 23 Jan 2013 14:14:20 +0000 (18:14 +0400)]
assign team to project from project page in public section
Andrey Kumanyaev [Tue, 22 Jan 2013 22:20:27 +0000 (02:20 +0400)]
update all teams code. refactoring and some corrections
Andrey Kumanyaev [Tue, 22 Jan 2013 21:03:52 +0000 (01:03 +0400)]
update routes