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

4197 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets c3659ef2e5 Fix merge request migration for postgres 2013-02-25 08:53:49 +02: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
Dmitriy Zaporozhets 46d353304a Merge pull request #3073 from dmedvinsky/cosmetic-search-transition 
Add transition on search box
 2013-02-24 04:03:16 -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 292dffc228 Add new entries to CHANGELOG 2013-02-21 17:01:02 +02: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 be817c53c6 Update database cleaner. Remove postgres from travis build list since it gives us deadlocks always 2013-02-21 14:11:04 +02:00
Dmitriy Zaporozhets cce14e0b01 Removing ambiguity and non-working selectors 2013-02-21 13:28:05 +02:00
Dmitriy Zaporozhets 5aeaf248f1 Fixing rspec after upgrade to capybara pt1 2013-02-21 13:09:47 +02:00
Dmitriy Zaporozhets 2d5096b678 Fix ambiguity for member link in test 2013-02-21 12:39:09 +02:00
Dmitriy Zaporozhets 37187336b1 Team features are green now 2013-02-21 12:27:52 +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
Dmitriy Zaporozhets 03f6a28ec0 move capybara scenarios to spec/features 2013-02-21 10:41:37 +02:00
Dmitriy Zaporozhets 9f722427e5 Add LoginHelpers to feature type 2013-02-21 10:41:13 +02:00
Dmitriy Zaporozhets 830da0c218 Update capybara, poltergeist, spinach, rspec-rails 2013-02-21 10:28:13 +02:00
Dmitriy Zaporozhets af3138e801 Update sidekiq 2013-02-21 10:00:18 +02:00
Dmitriy Zaporozhets 585259b837 Fix merge state detection 2013-02-21 09:25:07 +02:00
Axilleas Pipinellis a3bbc5956b We don't need to check .profile now that gitolite is replaced by gitlab-shell 2013-02-20 17:36:09 +02:00
Andrew8xx8 6d68923edc human_merge_status replaced by human_merge_status_name 2013-02-20 17:50:29 +04:00
Andrew8xx8 52e0df5c23 class.self methods moved to scopes 2013-02-20 17:50:24 +04:00