Dmitriy Zaporozhets
92039dd677
Developers can merge MR if target branch is not protected
2013-02-27 20:20:31 +02:00
Sebastian Ziebell
d269d107d8
API: fixed adding a note
...
Now the correct attribute is checked if it's available or not. Also fixed a test.
2013-02-27 18:12:02 +01:00
Sebastian Ziebell
3bb342b961
Merge branch 'master' into fixes/api
2013-02-27 17:52:59 +01:00
Sebastian Ziebell
7499f65014
API: extracted helper method to validate required parameters, code clean up
...
Added a helper method to check if required parameters are given in an API call. Can be used
to return a `400 Bad Request` return code if a required attribute is missing.
Code clean up and fixed tests.
2013-02-27 17:50:30 +01:00
Dmitriy Zaporozhets
33cd1ae9dc
Update README
2013-02-27 18:09:48 +02:00
Sebastian Ziebell
43d7596030
Merge branch 'feature/api-documentation-fixes' of github.com:Xylakant/gitlabhq into fixes/api
...
Conflicts:
doc/api/projects.md
2013-02-27 16:49:45 +01:00
Dmitriy Zaporozhets
b3d648b4e8
Prevent duplicate merge events
2013-02-27 17:48:51 +02:00
Nihad Abbasov
3c5954b8c8
proper fix for #2300
2013-02-27 06:47:04 -08:00
Sebastian Ziebell
07f306d8af
Merge branch 'master' into fixes/api
2013-02-27 15:15:47 +01:00
Sebastian Ziebell
3b3add35fb
API: merge request documentation updated, added return codes to functions
...
The API documentation of merge requests contains info to status codes for all functions.
Required arguments are now checked in the merge requests API functions and a `400 Bad Request` error is
returned if they are not given.
2013-02-27 15:07:42 +01:00
Nihad Abbasov
e4b67d3b18
Merge pull request #3095 from fdiary/update-grape-for-ruby2.0
...
update grape to 0.3.1 for ruby 2.0 support.
2013-02-27 06:06:02 -08:00
Nihad Abbasov
8d847b89d2
API: fix commits pagination
...
closes #2300
2013-02-27 06:00:33 -08:00
Sebastian Ziebell
e96d77d3db
API: issues documentation and API functions updated
...
The issues documentation is updated with infos to status codes and the deprecated `DELETE` function and
how to close an issue. A few more tests added to check status codes of API functions.
2013-02-27 14:36:20 +01:00
Sato Hiroyuki
f11e855bdb
Finding free space from the way near commit which is downward
2013-02-27 21:49:53 +09:00
Sebastian Ziebell
dffc2b8a8b
API: session documentation updated and test added
2013-02-27 12:58:06 +01:00
Sebastian Ziebell
873db06255
API: groups documentation updated, functions return different status codes
...
Updates the API documentation of groups with infos to return codes. The function calls
in the groups API have updated documentation and return `400 Bad Request` status code
if a required attribute is missing.
2013-02-27 12:34:45 +01:00
tsl0922
df63ab78a8
Fix project transfer error
2013-02-27 18:27:10 +08:00
Sebastian Ziebell
e119b0a0cb
API repository documentation updated, includes infos to return codes
...
The API documentation of repository is updated and now contains infos to status codes.
Code documentation is also adjusted for `GET /projects/:id/repository/commits` and includes infos to
pagination attributes. Tests are updated.
2013-02-27 11:24:12 +01:00
Sebastian Ziebell
ac4a09e9cc
Merge branch 'master' into fixes/api
2013-02-27 10:16:48 +01:00
Andrew8xx8
4a55c69877
Data converting migrations was wrong. Fixed
2013-02-27 12:53:36 +04:00
Dmitriy Zaporozhets
135418dcbf
fixed popen test
2013-02-27 08:24:12 +02:00
Dmitriy Zaporozhets
cba6e92436
move transfer logic out of project to service
2013-02-26 23:14:32 +02:00
Dmitriy Zaporozhets
0cf0487d65
Fix TestHookContext
2013-02-26 23:04:14 +02:00
Dmitriy Zaporozhets
4e5164338a
specs for api/internal
2013-02-26 22:53:59 +02:00
Dmitriy Zaporozhets
2c5e4955c0
specs for Gitlab::Popen
2013-02-26 22:53:46 +02:00
Kazuhiko
3b548d9251
update grape to 0.3.1 for ruby 2.0 support.
...
add grape-entity, that is split from grape 0.3.0.
remove usage of deprecated error_format, that is removed in grape 0.2.3.
2013-02-26 21:31:45 +01:00
Sato Hiroyuki
aa36f07a02
Fix the commits are not ordered commiter date.
...
It is fixed that the date label of network graph is broken.
2013-02-26 21:20:14 +09:00
Sato Hiroyuki
d8a40d8c93
Move graph module from lib or vendor directory to app directory.
...
Because not autoloading lib directory at development mode.
2013-02-26 20:31:39 +09:00
Dmitriy Zaporozhets
9c252a60c1
remove tests for unexisting methods
2013-02-26 11:17:02 +02:00
Dmitriy Zaporozhets
15c0e58a49
remove unused code related to gitolite
2013-02-26 11:11:43 +02:00
Dmitriy Zaporozhets
c08f19f275
email validation added
2013-02-26 11:09:32 +02:00
Dmitriy Zaporozhets
f2cac135d5
Merge branch 'Undev-state-machine-stage-2'
2013-02-26 10:48:30 +02:00
Dmitriy Zaporozhets
5ac5510fd6
Fix automerge detection client-side since #3056
2013-02-26 10:47:27 +02:00
Dmitriy Zaporozhets
d7b667fee2
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
...
Conflicts:
app/models/merge_request.rb
2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets
0cc95ef2f5
Merge pull request #2889 from kennytm/master
...
Show only ≤16 lines of codes in a discussion in a MR (issue #2860 ).
2013-02-26 00:32:02 -08:00
Dmitriy Zaporozhets
573942263a
Fix issue edit button showup
2013-02-26 10:17:09 +02:00
Dmitriy Zaporozhets
c9b1df1201
Fixing tests
2013-02-25 23:16:34 +02:00
Dmitriy Zaporozhets
39fe9b644f
Add close issue to note actions bar
2013-02-25 23:10:50 +02:00
Dmitriy Zaporozhets
8de19b259e
proper name for issue partial
2013-02-25 22:56:10 +02:00
Dmitriy Zaporozhets
5e69ad2cea
Sanitize user profile input
2013-02-25 22:51:15 +02:00
Dmitriy Zaporozhets
db8baf2895
Since search_autocomplete_source rendered with raw all human input should be sanitized to prevent XSS
2013-02-25 22:12:11 +02:00
Dmitriy Zaporozhets
d0646babdb
Remove gitolite mention from docs
2013-02-25 21:45:33 +02:00
Dmitriy Zaporozhets
f17fe7fff2
correct indentation in activity observer
2013-02-25 21:26:15 +02:00
Dmitriy Zaporozhets
7bab81b199
Move git post push logic to service
2013-02-25 21:21:38 +02:00
Dmitriy Zaporozhets
9611640e38
Merge pull request #3052 from Undev/system-hook-observer-improves
...
System hooks code & logic refactoring
2013-02-25 10:15:23 -08:00
Dmitriy Zaporozhets
72d48376ab
Merge pull request #3057 from axilleas/master
...
Remove function 'check_issue_1059_shell_profile_error' from check.rake as it is not needed anymore
2013-02-25 10:11:52 -08:00
Dmitriy Zaporozhets
580a56b6ff
Update grit to handle symlinks
2013-02-25 19:44:37 +02:00
Dmitriy Zaporozhets
262f80a68a
Update grit for ruby 2.0 support
2013-02-25 19:22:46 +02:00
Dmitriy Zaporozhets
3cf814ff9d
remove duplicate finder in features/steps/path
2013-02-25 10:28:59 +02:00
Dmitrii Pakhtinov
e975ed836d
Distorted lines in diff
...
Distorted lines in `diff` when viewing files `windows-style-line-separator: \r\n`
2013-02-25 12:21:38 +04:00
