Commit graph

4163 commits

Author SHA1 Message Date
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
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
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
Dmitriy Zaporozhets
ba1a453ef3 Merge pull request #3053 from m4tthumphrey/api-delete-hook-by-id
Fix RESTfulness of project hook deletions by API
2013-02-20 05:22:38 -08:00
Matt Humphrey
dddf6eab2d Removed unnecessary paramter hash. Also tidied up hash format in hook creation spec 2013-02-20 11:45:54 +00:00
Matt Humphrey
33c513274d Fix RESTfulness of project hook deletions by API 2013-02-20 11:35:36 +00:00
Dmitriy Zaporozhets
b7ac654b88 Merge pull request #2988 from Asquera/error_project_limit
API: creating last project before limit returns 404
2013-02-20 02:47:30 -08:00
Dmitriy Zaporozhets
25e4c512d4 Merge pull request #3011 from Asquera/fix_access_to_nonvisible_hook
API: fixes visibility of project hook
2013-02-20 02:45:07 -08:00
Dmitriy Zaporozhets
c56d32c73e Merge pull request #3038 from dmedvinsky/commit-time
Add commit full time tooltip to `commited_ago`
2013-02-20 02:41:35 -08:00
Dmitriy Zaporozhets
36ea32162d Merge pull request #3045 from eldios/patch-1
Update doc/install/installation.md
2013-02-20 02:29:16 -08:00
Dmitriy Zaporozhets
e7a5ec3376 Merge pull request #3043 from sjmulder/state-seed
Update seeds for state columns
2013-02-20 02:28:44 -08:00
Nihad Abbasov
08f665cf28 API docs: fix new milestone parameters 2013-02-20 11:41:32 +04:00
Lele
49a46d6ca9 Update doc/install/installation.md
changed installation overview list step #4
Gitolite -> GitLab shell
2013-02-20 02:01:39 +01:00
Sijmen Mulder
3a45e6010f Update seeds for state columns 2013-02-19 22:14:28 +01:00
Dmitry Medvinsky
eb58529757 Add commit full time tooltip to commited_ago 2013-02-19 19:56:43 +04:00
Dmitriy Zaporozhets
6bc9249b38 Merge pull request #3034 from Andrew8xx8/patch-2
Event already has author relation
2013-02-19 03:27:42 -08:00
Andrew Kulakov
303fb06c96 Event already has author relation 2013-02-19 15:22:29 +04:00
Dmitriy Zaporozhets
401041cfd6 Merge pull request #3032 from raphendyr/fix_development_environment
Fix development fixture for gitlab_shell
2013-02-19 01:49:36 -08:00
Dmitriy Zaporozhets
67465dc5ef Fix private flag for project 2013-02-19 11:45:49 +02:00
Jaakko Kantojärvi
fab586bc87 Fix development fixture for gitlab_shell 2013-02-19 11:17:59 +02:00
Dmitriy Zaporozhets
5d72a3e133 Merge branch 'Undev-state-machine' 2013-02-19 11:04:54 +02:00
Dmitriy Zaporozhets
155703c613 Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Andrew8xx8
6e333d5075 Javascript widget fixed 2013-02-19 12:57:09 +04:00
Dmitriy Zaporozhets
52028dcd2d Merge pull request #3013 from crystax/master
Sort groups alphabetically on dashboard page
2013-02-19 00:51:08 -08:00
Dmitriy Zaporozhets
bfc359ca61 Fix project filter for MR on dashboard 2013-02-19 09:43:41 +02:00
Andrew8xx8
d58eb62d68 Migrations iproved 2013-02-19 11:32:10 +04:00
Dmitry Moskalchuk
f7ae1bce25 Syntax fix of sorting groups/users 2013-02-19 11:13:19 +04:00
Dmitriy Zaporozhets
ba937b2b3d Dont show assigned_teams block unless any. Show count in filter 2013-02-18 21:21:24 +02:00
Dmitriy Zaporozhets
a29db26cc9 Refactor and restyle team page for project 2013-02-18 21:10:49 +02:00
Dmitriy Zaporozhets
e9d8d074a1 no projects message in group area 2013-02-18 20:31:43 +02:00