Commit graph

4324 commits

Author SHA1 Message Date
Sato Hiroyuki
00d0e57e85 Commits are arranged below their first parent. 2013-02-28 11:46:17 +09:00
Sato Hiroyuki
14c2a37da2 A tip is made slanting. 2013-02-28 11:44:52 +09:00
Sato Hiroyuki
38fce3deb0 It improves detecting an overlap of a line 2013-02-28 11:44:40 +09:00
Sytse Sijbrandij
46bbeabcde Link to new contributing file and the requirements doc. 2013-02-27 22:17:46 +01:00
Sytse Sijbrandij
5f9bc743f5 Update contributing file with latest insights. 2013-02-27 21:51:46 +01:00
Ezekiel Templin
70e1b3b1cb Update binding_of_caller version
Updating this dependency fixed my Ruby 2.0 installation issues.
2013-02-27 14:32:36 -05:00
Dmitriy Zaporozhets
863d297ede reduce fonts size for wiki render 2013-02-27 21:10:23 +02:00
Dmitriy Zaporozhets
2c71c2e1df trying new readme 2013-02-27 21:05:57 +02:00
Dmitriy Zaporozhets
60fdc04d03 Merge pull request #3098 from Undev/important-migrations-fix
IMPORTANT! Data converting in migrations was wrong. Fixed
2013-02-27 10:52:42 -08:00
Dmitriy Zaporozhets
b2a69262e1 Merge pull request #3101 from tsl0922/master
Fix project transfer error
2013-02-27 10:48:14 -08:00
Dmitriy Zaporozhets
aceb747bb8 use system call to start sidekiq 2013-02-27 20:40:01 +02:00
Dmitriy Zaporozhets
92039dd677 Developers can merge MR if target branch is not protected 2013-02-27 20:20:31 +02:00
Dmitriy Zaporozhets
33cd1ae9dc Update README 2013-02-27 18:09:48 +02: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
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
Sato Hiroyuki
f11e855bdb Finding free space from the way near commit which is downward 2013-02-27 21:49:53 +09:00
tsl0922
df63ab78a8 Fix project transfer error 2013-02-27 18:27:10 +08: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