Dmitriy Zaporozhets
c2ba868c9b
Merge pull request #2954 from cabeca/fix-image-url-emoji
...
Fix image url for emoji.
2013-03-05 05:52:01 -08:00
Dmitriy Zaporozhets
f22488f726
Merge pull request #3143 from Undev/state-machine-3
...
State machine 3
2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets
f9200e118c
remove custom font
2013-03-05 13:16:56 +02:00
Dmitriy Zaporozhets
9bb35e7e59
Prevent app crash if team owner removed
2013-03-05 09:27:06 +02:00
Dmitriy Zaporozhets
3a09f02e11
Merge pull request #3109 from hiroponz/improve-network-graph
...
Improve network graph
2013-03-04 23:02:27 -08:00
J. Francisco Raposerias
a40541c42d
add autofocus to username input
2013-03-04 17:54:26 -03:00
Dmitriy Zaporozhets
bf06b3196d
Make clone widget read-only
2013-03-04 22:18:53 +02:00
Dmitriy Zaporozhets
730e79e787
better event-notes typography
2013-03-04 22:00:51 +02:00
Dmitriy Zaporozhets
d54845a16a
use md-typography for note content
2013-03-04 21:34:26 +02:00
Dmitriy Zaporozhets
dc7507cfe7
= preserve do was ignored for empty project page so was replaced with filter
2013-03-04 21:12:36 +02:00
Dmitriy Zaporozhets
533693ab41
Fix dark color bg for wiki
2013-03-04 21:11:03 +02:00
Dmitriy Zaporozhets
24cc0faf2c
add link ti public area
2013-03-04 20:11:23 +02:00
Dmitriy Zaporozhets
c2082f4d78
Fix edit team page
2013-03-04 19:47:20 +02:00
Andrew8xx8
0d9a6fe7b1
User's blocked field refactored to use state machine
2013-03-04 18:52:30 +04:00
Dmitriy Zaporozhets
5b4032d175
Merge pull request #3118 from 2called-chaos/dont_send_mails_twice
...
Do not send issue status mail twice if author = assignee
2013-03-02 10:48:22 -08:00
Dmitriy Zaporozhets
907c334fe0
fix decorate call for milestone users
2013-03-02 13:23:30 +02:00
Dmitriy Zaporozhets
ef646928e4
better presenting for group description
2013-03-01 16:26:26 +02:00
Sven Pachnit
c280c3ce6d
Do not send issue status mail twice if author = assignee
2013-03-01 15:09:14 +01:00
Dmitriy Zaporozhets
5c3cb47c16
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
...
Conflicts:
db/schema.rb
2013-03-01 16:05:51 +02:00
Dmitriy Zaporozhets
dbcf4144ee
use simple decorate on single commits
2013-03-01 15:35:22 +02:00
Dmitriy Zaporozhets
6aead7991f
fix decorate calls on collections after draper update
2013-03-01 15:24:59 +02:00
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
Andrew8xx8
2f1f05d431
Fixed notes from randx
2013-02-28 18:55:35 +04:00
Thomas Berger
7ed0878654
added text-templates for mail notification
2013-02-28 16:39:58 +02:00
Andrew8xx8
d3f042a6f2
Css classes improved
2013-02-28 18:35:27 +04:00
Andrew8xx8
9c747fbb95
Missing descriptions added
2013-02-28 17:37:02 +04:00
Andrew8xx8
9959669f1c
Desctiptions removed from dashboard
2013-02-28 17:15:22 +04:00
Andrew8xx8
3d4e32457b
Table description indentation fixed
2013-02-28 17:15:22 +04:00
Andrew8xx8
5f657203a1
Description added to temas
2013-02-28 17:15:22 +04:00
Andrew8xx8
9f45e01e84
Description to groups added
2013-02-28 17:14:21 +04: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
Sato Hiroyuki
2a687dd562
Show gravatar icon on tooltip.
2013-02-28 14:56:27 +09:00
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
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
Sebastian Ziebell
3bb342b961
Merge branch 'master' into fixes/api
2013-02-27 17:52:59 +01:00
Dmitriy Zaporozhets
b3d648b4e8
Prevent duplicate merge events
2013-02-27 17:48:51 +02: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
Sebastian Ziebell
ac4a09e9cc
Merge branch 'master' into fixes/api
2013-02-27 10:16:48 +01: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
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
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
Dmitriy Zaporozhets
585259b837
Fix merge state detection
2013-02-21 09:25:07 +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
Andrew8xx8
e2d94e0719
State machine added for merge_status field
2013-02-20 17:49:48 +04:00
Sebastian Ziebell
eefb27f5ae
Merge branch 'master' into fixes/api
...
Conflicts:
spec/requests/api/projects_spec.rb
2013-02-20 12:43:32 +01:00
Andrew8xx8
99760edc75
Method moved to service
2013-02-20 15:33:03 +04:00
Andrew8xx8
aa1780d03c
System hooks execution moved to System hook service
2013-02-20 14:53:15 +04: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
Andrew8xx8
468c8c5f0a
A little bit of codestyle improvments
2013-02-20 13:15:56 +04:00
Dmitry Medvinsky
eb58529757
Add commit full time tooltip to commited_ago
2013-02-19 19:56:43 +04:00
Andrew Kulakov
303fb06c96
Event already has author relation
2013-02-19 15:22:29 +04: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