deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4262 commits 6 branches 43 tags 25 MiB
Commit graph

2453 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
22d6ce9873 Merge pull request #3082 from devote/patch-1 
Distorted lines in `diff`
 2013-02-28 23:46:07 -08:00
Dmitriy Zaporozhets
1c517153a8 fix admin users tests 2013-02-28 19:56:36 +02:00
Dmitriy Zaporozhets
115454f3ed created-by-me filter for issues inside project. Fixed global project.issues order 2013-02-28 17:46:28 +02:00
Dmitriy Zaporozhets
e1f77b9be0 Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker 
Conflicts:
	Gemfile.lock
 2013-02-28 17:02:20 +02:00
Thomas Berger
7ed0878654 added text-templates for mail notification 2013-02-28 16:39:58 +02:00
Andrew8xx8
cff845784e Show Issues tracker select only if one or more remote issue trackers available 2013-02-28 16:11:14 +04:00
Andrew8xx8
b6d0f2852d Issues link from project page follows on remote bug tracker if it selected now 2013-02-28 16:11:14 +04:00
Andrew8xx8
ab98db73a3 Issues tracker settings enableds/disableds without page reloading now 2013-02-28 16:11:14 +04:00
Andrew8xx8
bca72eac74 Default issue tracker name added to gon variables 2013-02-28 16:11:14 +04:00
Andrew8xx8
cf3cf3750e Gem gon added. It produces server-side variable values in javascript 2013-02-28 16:11:14 +04:00
Andrew8xx8
c643b50dbd Default value for issues_tracker setting added 2013-02-28 16:11:13 +04:00
Andrew8xx8
16c720fd96 Issues helper improved 2013-02-28 16:11:13 +04:00
Andrew8xx8
0afdf39dbc New field added 2013-02-28 16:11:13 +04:00
Andrew8xx8
68a7ecdaaf Project issue tracker functions refactored 2013-02-28 16:10:00 +04:00
Andrew8xx8
999fc2391b Issue tracker added to edit project form in admin area 2013-02-28 16:10:00 +04:00
Andrew8xx8
e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Dmitriy Zaporozhets
fa6bf2c0f5 remove unnecessary center tag in devise layout 2013-02-28 12:08:25 +02:00
Dmitriy Zaporozhets
54d95f5897 Restyle flash message. Not it does not overflow head panel 2013-02-28 11:06:52 +02:00
Dmitriy Zaporozhets
863d297ede reduce fonts size for wiki render 2013-02-27 21:10:23 +02: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
92039dd677 Developers can merge MR if target branch is not protected 2013-02-27 20:20:31 +02:00
Dmitriy Zaporozhets
b3d648b4e8 Prevent duplicate merge events 2013-02-27 17:48:51 +02:00
tsl0922
df63ab78a8 Fix project transfer error 2013-02-27 18:27:10 +08: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
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
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
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
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
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
Dmitriy Zaporozhets
ed60b6fc90 Merge pull request #3071 from dmedvinsky/fix-webhook-auth 
Fix WebHook and special symbols in credentials
 2013-02-24 04:13:15 -08:00
Dmitriy Zaporozhets
3432c9aed7 Merge pull request #3072 from dmedvinsky/add-title-remove-member 
Add title for "Remove from team" button
 2013-02-24 04:04:58 -08:00
Dmitry Medvinsky
b0fb68c191 Add transition on search box 
It's kind of cool trend to use animated-expanding search box nowadays.
E.g. see Github.
 2013-02-22 20:50:17 +04:00
Dmitry Medvinsky
30180ed82e Add title for "Remove from team" button 2013-02-22 20:29:03 +04:00
Dmitry Medvinsky
dbd9d8d4c3 Fix WebHook and special symbols in credentials 
When using web hook with credentials secured web resource, one needs to
put the credentials in the hook URL.

If the credentials contain special symbols (e.g. @ or #), it should be
URL-quoted (e.g. %40 instead of @).

But when Gitlab is making a request, it should unquote the symbols
before base64-encoding them.
 2013-02-22 20:10:25 +04:00
Dmitriy Zaporozhets
99b6750e15 Restore old order for MR lists. Fix failing tests 2013-02-21 16:26:09 +02:00
Dmitriy Zaporozhets
4a137651ec Fix merge request closed filter. Fixed one more test 2013-02-21 14:11:24 +02:00
Dmitriy Zaporozhets
5aeaf248f1 Fixing rspec after upgrade to capybara pt1 2013-02-21 13:09:47 +02:00
Andrew8xx8
c77730dd71 An Id must be sended to queue 2013-02-21 14:04:06 +04:00
Dmitriy Zaporozhets
28da2a8bdc Monkeypatch satellite call for merge request in tests 2013-02-21 11:44:33 +02:00
Dmitriy Zaporozhets
42ce2c1080 improve selectors to pass capybara 2.0 2013-02-21 11:27:22 +02:00