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
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
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
Dmitriy Zaporozhets
e049e18780
Merge pull request #2991 from raphendyr/username_change_disablation
...
Add option to disable username changing
2013-02-18 09:59:24 -08:00
Dmitriy Zaporozhets
ea28519f57
Merge pull request #2996 from raphendyr/ssh_fingerprint_fix
...
Ssh fingerprint fix
2013-02-18 09:56:35 -08:00
Dmitriy Zaporozhets
97de6f851b
Fix not-working team memebership permissions change
2013-02-18 16:40:11 +02:00
Andrew8xx8
d27ed43daa
Hash syntax improved
2013-02-18 17:22:18 +04:00
Andrew8xx8
557a9fa321
Debug remomved
2013-02-18 17:16:29 +04:00
Andrew8xx8
ff94f29be5
States events fixed
2013-02-18 16:49:56 +04:00
Andrew8xx8
231d9e0426
Observer refactored to use StateMachine events
2013-02-18 16:49:17 +04:00
Dmitriy Zaporozhets
1481d1cfe0
Merge branch 'count_user_owned_projects' of /home/git/repositories/gitlab/gitlabhq
2013-02-18 12:46:45 +00:00
Dmitriy Zaporozhets
01a7250ba5
Add user to team he creates
2013-02-18 14:35:38 +02:00
Marin Jankovski
1734611181
Count owned projects, not just personal
2013-02-18 13:15:35 +01:00
Andrew8xx8
6074896cbf
Spinach tests fixed
2013-02-18 14:43:50 +04:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
0b512af803
Milestone uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
29f70acc98
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
f97296597c
Issuable consern uses StateMachine now
2013-02-18 14:43:49 +04:00
Andrew8xx8
8db3920c01
State renamed to merge_status
2013-02-18 14:43:49 +04:00
Dmitriy Zaporozhets
020078663e
Prevent xss attack over group name. Added regex validation for group and team name
2013-02-18 09:28:18 +02:00
Dmitriy Zaporozhets
cfdf94fc27
use attachment secure_url for Attachemnt page
2013-02-17 16:18:42 +02:00
Dmitriy Zaporozhets
0d3b75845a
Merge pull request #3017 from jojosch/owner-link-admin
...
Fix link to owner of group and team in admin interface
2013-02-17 06:15:33 -08:00
Miguel Cabeça
157b038661
Include Riyad Preukschas suggestions.
2013-02-17 13:02:22 +00:00
Dmitriy Zaporozhets
1efeb1b562
redesign mars theme a bit. Better border color for search-input for dark theme
2013-02-17 12:16:19 +02:00
Dmitriy Zaporozhets
32a5548c41
Fix link color for dark theme
2013-02-17 12:05:26 +02:00
Johannes Schleifenbaum
3ae7a45d5a
Fix link to owner of group and team in admin interface
2013-02-17 11:00:02 +01:00
Dmitriy Zaporozhets
9764ba6df2
create satellite for imported repo
2013-02-16 21:47:43 +02:00
Dmitriy Zaporozhets
42ffbea8e0
Fix logo alignment for default theme
2013-02-16 21:37:06 +02:00
Dmitriy Zaporozhets
18a496142b
Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme
2013-02-16 21:24:51 +02:00
Dmitry Moskalchuk
a9c1b85e08
Sort groups/namespaces by human name
2013-02-16 19:40:33 +04:00
Dmitry Moskalchuk
2a4ef0fe49
Sort groups alphabetically on dashboard page
2013-02-16 19:11:36 +04:00
Dmitriy Zaporozhets
fa3cc1dd24
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
2013-02-16 12:45:20 +00:00
Dmitriy Zaporozhets
b729728536
uppercase Gitlab version and revision constants. check api return gitlab version now
2013-02-16 14:42:22 +02:00
Fumiya Nakamura
20868acc96
Fix file_path to correspond with the name
2013-02-15 05:50:42 -08:00
Fumiya Nakamura
a1d106110d
Fix file_name for archive
2013-02-15 05:00:15 -08:00
Jaakko Kantojärvi
6fd88b8cbb
Fix ssh key fingerprinting test to use exitcode
2013-02-15 11:16:21 +02:00
Dmitriy Zaporozhets
f6cc71bc36
Per project protection
2013-02-15 09:51:21 +02:00
Dmitriy Zaporozhets
4821aa6c25
skip protection to aws3
2013-02-15 09:49:35 +02:00
Dmitriy Zaporozhets
f9dd547aa7
remove commented code
2013-02-15 09:16:46 +02:00
Sebastian Ziebell
c8b92a4be2
Merge branch 'master' into fixes/api
2013-02-14 17:02:16 +01:00
Jaakko Kantojärvi
ba65f2910b
Add option to disable username changing
...
This option allows to disable users from changing their username.
This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.
You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
Sebastian Ziebell
6df02adc7a
API: status code 403 returned if new project would exceed limit
...
When the project limit is reached the user is not allowed to create new ones.
Instead of error code 404 the status code 403 (Forbidden) is returned with error
message via API.
2013-02-14 15:51:56 +01:00
Dmitriy Zaporozhets
7fad4a9636
Merge pull request #2989 from PierreGambarotto/master
...
archive download : namespace directory not created
2013-02-14 05:53:07 -08:00
Pierre Gambarotto
b6b6b640b1
fix archive download : not creating namespace directory
2013-02-14 14:29:24 +01:00
Dmitriy Zaporozhets
b698094d4d
Update post-receive worker to use correct identifier
2013-02-14 14:00:02 +02:00
Sebastian Ziebell
3025824415
API: refactored last fix, project limit in web client is fixed too
...
The previous call `saved?` is restored in the `POST /projects` method in the API.
It is refactored to check if the record is persisted. This is useful to not validate
the record again after saving. This fixes the returned status code in the web client
too. If the last project is created via web client instead of error notification
the project page is shown.
2013-02-14 12:58:33 +01:00
Dmitriy Zaporozhets
ed3f44085e
Redesign Admin -> user -> show page
2013-02-13 19:14:35 +02:00
Dmitriy Zaporozhets
6b24c375cb
style admin -> users page. Search by username too
2013-02-13 17:28:28 +02:00
Dmitriy Zaporozhets
fd5dc597ed
Add placeholder for project import
2013-02-13 15:27:18 +02:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Dmitriy Zaporozhets
622dae76cc
style network graph form a bit
2013-02-12 19:22:40 +02:00
Dmitriy Zaporozhets
ddea7d1689
Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph
2013-02-12 19:02:05 +02:00
Dmitriy Zaporozhets
d6513b5153
Merge pull request #2924 from cdawzrd/patch-2
...
Disable autocomplete for admin/users form
2013-02-12 08:45:07 -08:00
Dmitriy Zaporozhets
06dd530ede
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
2013-02-12 10:53:51 +00:00
Dmitriy Zaporozhets
806b76a168
rename scope to prevent name collision
2013-02-12 11:46:50 +02:00
Dmitriy Zaporozhets
4bf63212d7
Merge branch 'fix-db-after-updating-rails' of https://github.com/Undev/gitlabhq into Undev-fix-db-after-updating-rails
2013-02-12 11:13:25 +02:00
Dmitriy Zaporozhets
644f8819af
restore handling exception for project creation
2013-02-12 10:41:21 +02:00
Andrew8xx8
b5db541338
All scopes must be in lambdas
2013-02-12 11:16:45 +04:00
Dmitriy Zaporozhets
d138b3de4b
Render events for team dashboard
2013-02-11 23:23:38 +02:00
Dmitriy Zaporozhets
68aa88c9bd
Fix project creation without import
2013-02-11 23:13:21 +02:00
Dmitriy Zaporozhets
8bf8c70c4b
Import repo feature
2013-02-11 23:00:12 +02:00
Dmitriy Zaporozhets
a699ebdbcc
handle attahcment with send_file
2013-02-11 21:31:19 +02:00
Dmitriy Zaporozhets
ea0cb39d63
use proper name for gitlabshell worker
2013-02-11 19:27:26 +02:00
Dmitriy Zaporozhets
dd8d0a659d
Fix procfile and attachment in event nore
2013-02-11 19:25:06 +02:00
Dmitriy Zaporozhets
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
Dmitriy Zaporozhets
8e0b58d7e7
render note with attachment for event
2013-02-11 15:47:01 +02:00
Miguel Cabeça
f6957f7658
Fix image url for emoji.
2013-02-11 12:22:06 +00:00
Marin Jankovski
483f720861
UPdate field name.
2013-02-11 13:12:41 +01:00
Dmitriy Zaporozhets
ab19196391
fix attachment uploader for aws
2013-02-11 10:14:32 +02:00
Dmitriy Zaporozhets
fcfb6d8438
Since gitlab-shell no sense to check hooks
2013-02-11 09:15:42 +02:00
Dmitriy Zaporozhets
ff76e05271
show project head for empty project
2013-02-09 15:16:33 +02:00
Dmitriy Zaporozhets
152f87864c
remove useless warning
2013-02-09 12:32:24 +02:00
Dmitriy Zaporozhets
66121d6caa
Improve devise views
2013-02-07 13:20:33 +02:00
Dmitriy Zaporozhets
48628d31d5
dont allow duplicates in ssh keys
2013-02-07 09:42:22 +02:00
Jon Evans
6474797d1c
Update app/views/admin/users/_form.html.haml
2013-02-06 09:27:09 -05:00
Jon Evans
c9777518e3
Ruby 1.9 hash syntax
2013-02-06 09:26:46 -05:00
Jon Evans
4ce3ef41de
Disable autocomplete for admin/users form
...
Fixes #2796
2013-02-06 08:50:35 -05:00
Marin Jankovski
1b4ba3eb99
Add user delete option.
2013-02-06 12:44:09 +01:00
Dmitriy Zaporozhets
478570dc32
fix move repository
2013-02-05 13:43:25 +02:00
Dmitriy Zaporozhets
70e3bffd95
Fixed: post-receive, project remove, tests
2013-02-05 12:47:50 +02:00
Sato Hiroyuki
8ff5cf9cd5
Add search box for the commit.
2013-02-05 19:08:09 +09:00
Dmitriy Zaporozhets
39e37677f2
add remove keys from gitlab-shell by id
2013-02-05 11:12:15 +02:00
Dmitriy Zaporozhets
081c272b85
Remove outdated specs and fixed key remove
2013-02-05 10:15:49 +02:00
Sato Hiroyuki
81cc1cb87b
Enable to display the commit older than 650th commit.
2013-02-05 12:42:30 +09:00
Sato Hiroyuki
1e907498a9
The commit is marked and displayed in the center.
2013-02-05 12:34:35 +09:00
Dmitriy Zaporozhets
6f7ccea668
Fix satellites to use filesystem. Correct post-receive user finder
2013-02-04 16:19:37 +02:00
Dmitriy Zaporozhets
896c3a0a9d
remove update_repository calls
2013-02-04 15:24:16 +02:00
Dmitriy Zaporozhets
27d9ac0fe8
Make gitlab works with gitlab-shell
2013-02-04 15:07:56 +02:00
KennyTM~
e565be241f
Show only ≤16 lines of code in a discussion (fix issue #2860 ).
2013-02-03 03:33:42 +08:00
Dmitriy Zaporozhets
85de55a120
Dont allow gitlab be loaded in iframe
2013-02-02 20:32:13 +02:00
Dmitriy Zaporozhets
0965aeb2ea
Fix crash on team update
2013-02-01 19:07:54 +02:00
Dmitriy Zaporozhets
e6002bdaff
Ability to manage and remove group as owner outside of admin area
2013-02-01 19:04:11 +02:00
Dmitriy Zaporozhets
591e094e06
Add a delay for sending emails
2013-02-01 17:04:41 +02:00
Dmitriy Zaporozhets
61833bcb74
fix app crash if author is missing
2013-02-01 09:33:12 +02:00
Dmitriy Zaporozhets
cc2484c3e6
Fix sending commit note email to id instead email
2013-02-01 08:59:30 +02:00
Dmitriy Zaporozhets
130f60d55b
a bit of restyling. Replace some images with icons. Simplify note form
2013-01-31 11:22:06 +02:00
Dmitriy Zaporozhets
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets
563c55eb7e
fix pagination issue
2013-01-31 08:55:31 +02:00
Dmitriy Zaporozhets
8c50707dd4
Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph
...
Switchable the main branch on network graph
2013-01-30 22:21:19 -08:00
Dmitriy Zaporozhets
1fdeb9e030
Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq
2013-01-30 17:28:48 +00:00
Dmitriy Zaporozhets
bfd00caff3
Few usability improvments
2013-01-30 17:13:05 +02:00
Dmitriy Zaporozhets
560985b0f6
Fixed link_to_member
2013-01-30 17:07:44 +02:00
Dmitriy Zaporozhets
b096ee3275
a bit of split up for gitlab-bootstrap
2013-01-30 17:01:58 +02:00
Dmitriy Zaporozhets
b742f47e89
remove old alert messages
2013-01-30 16:53:18 +02:00
Dmitriy Zaporozhets
e2fb18a3ec
replace right with pull-right
2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
7d593c5446
Merge pull request #2837 from xudiera/master
...
Fixed a grammar mistake in alert-message.block-message
2013-01-30 06:32:02 -08:00
Sato Hiroyuki
525a8cd3e9
Switchable the main branch on network graph
2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets
7ba4f2dcfa
few styling for buttons
2013-01-29 22:57:15 +02:00
Dmitriy Zaporozhets
fb617c61b9
refactor buttons pt2
2013-01-29 22:29:21 +02:00
Dmitriy Zaporozhets
033aa1a885
refactor buttons pt1
2013-01-29 22:18:19 +02:00
Carlos Xudiera
cdd5543173
Fixed a grammar mistake in alert-message.block-message
2013-01-29 12:58:34 -05:00
Dmitriy Zaporozhets
7121a58eb9
Advanced logging for post-receive worker
2013-01-29 11:32:05 +02:00
Dmitriy Zaporozhets
f72dc7f779
dont escape images inside links for gfm. Fixes #2701
2013-01-29 11:00:56 +02:00
Dmitriy Zaporozhets
1c931fb814
fix key observer tests
2013-01-28 23:03:38 +02:00
Dmitriy Zaporozhets
299a9a1040
keys to gitolite via sidekiq now
2013-01-28 21:02:10 +02:00
Dmitriy Zaporozhets
8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets
1c5876eb7b
Do gitolite calls async. Remove satellite with project remove
2013-01-28 17:22:45 +02:00
Dmitriy Zaporozhets
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
Koen Punt
e33debc214
Updated commit diff view with some minor visual modifications
...
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
2013-01-27 18:27:32 +01:00
Dmitriy Zaporozhets
552e42f634
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
...
Updates web hooks to process via queue
2013-01-27 08:52:37 -08:00
Dmitriy Zaporozhets
ce0ec05c63
Pager.js to coffee
2013-01-27 18:47:19 +02:00
Dmitriy Zaporozhets
070f49fdc5
Make group name a link at header
2013-01-27 13:12:30 +02:00
Dmitriy Zaporozhets
6b01196fb2
Dashboard to resource
2013-01-27 12:56:20 +02:00
Dmitriy Zaporozhets
bd3b677b86
Add projects page to dashboard. Remove projects pagination on dashboard
2013-01-27 12:34:27 +02:00
Dmitriy Zaporozhets
b68bba441e
Fix projects in admin -> user -> show
2013-01-26 12:15:38 +02:00
Dmitriy Zaporozhets
0125b74b3c
Fix application crashes after #2772
2013-01-26 12:08:34 +02:00
Dmitriy Zaporozhets
71e89df5e0
Merge pull request #2772 from zzet/bugfix/path_and_page-project-member-access-#2745
...
fix edit project members access link and page fixes refs #2745
2013-01-25 13:45:08 -08:00
Andrey Kumanyaev
890e774ddc
Display actual user role (admin or not) in team members list
2013-01-26 01:14:36 +04:00
Andrey Kumanyaev
b280c2f361
Edit create new team text
2013-01-26 00:38:21 +04:00
Andrey Kumanyaev
45917935ef
fix copied code. Add assign projects button.
2013-01-26 00:37:55 +04:00
Andrey Kumanyaev
75a02e090a
simple cleanup code %)
2013-01-25 23:19:31 +04:00
Andrey Kumanyaev
c5cbbea82e
rewrite admin users controller (use 1 variable and find by username)
2013-01-25 22:38:24 +04:00
Andrey Kumanyaev
ef85202f71
fix links in admin group view page (user links)
2013-01-25 22:37:38 +04:00
Andrey Kumanyaev
916165dfc4
username is default param to User
2013-01-25 22:35:58 +04:00
Andrey Kumanyaev
df64bdffdf
Update user finding (by username) in teams members (team of users) controller
2013-01-25 22:35:31 +04:00
Andrey Kumanyaev
e1679d20c7
Update user finding (by username) in teams_members (project team) controller
2013-01-25 22:34:49 +04:00
Andrey Kumanyaev
f225ff8674
Update user finding (by username) in admin teams members controller
2013-01-25 22:33:49 +04:00
Andrey Kumanyaev
6efda51cc5
fix edit project members access link and page fixes refs #2745
2013-01-25 21:20:15 +04:00
Ryan LaNeve
8a65229b35
Updates project to process web hooks async via sidekiq.
...
A new queue of "project_web_hook" is used to process web hooks asynchronously, allowing each to succeed/fail (and be retried) independently.
(Basically, project web hooks now process the same as system hooks.)
2013-01-25 10:42:57 -05:00
Dmitriy Zaporozhets
74e329064a
teams refactoring and cleanup pt.1
2013-01-25 16:36:14 +02:00
Dmitriy Zaporozhets
1c88fbb391
show new group, new team links in profile
2013-01-25 16:25:43 +02:00
Dmitriy Zaporozhets
6743ecec59
Fix redirects. Add link to new team and new group
2013-01-25 16:18:37 +02:00
Dmitriy Zaporozhets
6350b32a3d
Fix security issues with teams
2013-01-25 15:51:45 +02:00
Dmitriy Zaporozhets
3ddd9f753c
Fix mass-assignment. Dont allow users w/o access to create team
2013-01-25 15:42:41 +02:00
Dmitriy Zaporozhets
70e05801b1
fix User.potential_team_members
2013-01-25 15:36:10 +02:00
Dmitriy Zaporozhets
8016a7bd33
fix 1145
2013-01-25 14:18:23 +02:00
Dmitriy Zaporozhets
5aca1d64e0
Fix project adding to team
2013-01-25 13:56:04 +02:00
Dmitriy Zaporozhets
20a4742efd
Fixing team tests
2013-01-25 11:36:15 +02:00
Dmitriy Zaporozhets
00e4a479d3
allow/deny user to create group/team
2013-01-25 11:30:49 +02:00
Dmitriy Zaporozhets
aa1f1eb680
Merge pull request #2746 from gitlabhq/features/teams
...
New feature: Teams
2013-01-25 00:46:20 -08:00
Dmitriy Zaporozhets
097e6053ef
Fix for broken commit_url in graph
2013-01-25 10:16:20 +02:00
Dmitriy Zaporozhets
ac8247b46d
Improved search. added filters
2013-01-25 10:07:21 +02:00
Andrey Kumanyaev
d839f6c525
Remove simple code duplication in members controllers
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
e52fec9cd9
Update check If user can assign project to team
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
6d713e84e1
remove unused code
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
7403afea97
Reject non-owned projects to assign to teams
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
b4967b3703
Dont allow to select a project you have no right to assign
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
11b7b93cf7
move team navs to upper nav
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
b5dd9e6775
Make a team and group boxes smaller on dashboard
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
ca752e64fb
Fix mispelling and ambiguous id in UserTeam.without_project
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
ca105d0462
Show only teams we have access to
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
645f960475
Few UI improvements
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
1a917bc954
fix scope to empty relation
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
2befa8fe30
Switch user link to profile link
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
690db9693f
fix tests
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
eb99feb4a7
simple refactoring
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
a5ce8696a6
remove unused autogenerated files
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
d721863382
Fix little bugs
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
31d84d71d3
assign team to project from project page in public section
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
18bd1c9d30
update all teams code. refactoring and some corrections
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
7534154b44
Add access control in public section to users teams
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
dcea52203d
remove before_filter from controllers
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
f87b76a805
refactoring user team in public section
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
f6f414ce3b
refactoring project team members controller (corresponding mental model)
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
ccf8fa4fa2
if project creator was remowed from Gitlab - creator is next admin, who edit this project
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
4ce715a360
Fix using context of Projects::UpdateContext (in admin section error, in public section - to next step if moving controlers)
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
1dd0feacc7
move Team_members controller into project (conflicts with team/members controller)
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
497f7ab5ba
save autogenerated files
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
17a8ee57fe
Remove old data
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
a7667ffc14
Repair members management of teams
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
b7470440ff
Move team project management to own controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
cca9935970
save generated files
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
9804b7df68
Move admin team members management to own controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
9d318db48f
Added the correct hierarchy of controllers for the administrative part
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
2984716870
Admin rename team page is fixed
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
6d1c566ec9
Rename Team class to ProjectTeam
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
c5f427b0a4
save commit
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
a987f1469e
commit user team helper
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
3a0d4865f6
update projects show css selector
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
b6458ae3b3
add into user decorator (presenter) to full user name
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
c098ac6430
update stylesheets (for teams block)
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
b9a7bcb6a4
add teams application controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
3c6e144608
add dashboard teams block
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
a96cf3ad09
Team projects public section
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
ea6f46cb87
Team members public section
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
911f6eb106
merge into public
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
7d3efec7d1
Add ability to teams
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
695becc4cb
Add teams into Public sections
2013-01-24 22:31:23 +02:00
Andrey Kumanyaev
82499a4cbf
Admin teams section added
2013-01-24 22:31:23 +02:00
Andrey Kumanyaev
8a86fe7bb0
Added UserTeam core models (team and m-t-m relationships) and updated other models
2013-01-24 22:31:23 +02:00
Dmitriy Zaporozhets
f6c482c06f
User can create group
2013-01-24 17:47:09 +02:00
Dmitriy Zaporozhets
62cb514070
Merge pull request #2712 from aus/patch-1
...
Revise projects/new text
2013-01-23 10:12:28 -08:00
Chris Waguespack
8ec36ca056
Update Markdown example to use username
...
Update the Markdown example in the Help pages to use username instead of user.
2013-01-23 09:58:38 -06:00
Austin Robertson
d3c34ef8af
Revise projects/new text
...
The previous text implied projects can only be private. Projects can now be private or public.
2013-01-23 08:47:19 -06:00
Dmitriy Zaporozhets
96d97c4857
Fix routing. Finalize user show page
2013-01-22 19:45:13 +02:00
Dmitriy Zaporozhets
70690e1971
base implementation
2013-01-22 19:05:01 +02:00
Dmitriy Zaporozhets
e0fb0703c4
Merge branch 'features/help_with_index'
2013-01-22 17:58:40 +02:00
Dmitriy Zaporozhets
2be107d0d9
Help with index
2013-01-22 17:58:09 +02:00
Valeriy Sizov
745c0dfa57
remove length of issue content
...
according to #2677
2013-01-22 17:15:22 +02:00
Valeriy Sizov
69ec189ad2
remove length of snippet content
2013-01-22 17:10:00 +02:00
Dmitriy Zaporozhets
ee43e9248c
Add warning if user own projet but not in team. Also show loading when merge MR
2013-01-21 15:05:18 +02:00
Dmitriy Zaporozhets
d1e63c7df2
Reporter cant create MR. Show user authorized projects in Admin area
2013-01-21 14:16:48 +02:00
Alex Denisov
e78e067204
Render empty string instead of nil
2013-01-21 09:48:25 +00:00
Riyad Preukschas
d9270337c1
Update text on help#public_access page
2013-01-19 15:27:03 +01:00
Riyad Preukschas
607a38dd00
Fix public/projects#index page
2013-01-19 15:27:00 +01:00
Riyad Preukschas
75447fb044
Redo help#help_pages partial
2013-01-19 15:26:40 +01:00
Riyad Preukschas
8a5b770c36
Reorder help routes
2013-01-19 15:26:23 +01:00
Riyad Preukschas
bba88e84a9
Fix public layout
2013-01-19 15:24:56 +01:00
Riyad Preukschas
8db80f1f6d
Rename help#public_area to help#public_access
2013-01-19 15:24:51 +01:00
Riyad Preukschas
359703c696
Fix public cloning option text on projects#edit page
2013-01-19 15:24:37 +01:00
Riyad Preukschas
7e6a5800b6
Fix text on groups#show page
2013-01-19 15:24:07 +01:00
Dmitriy Zaporozhets
cfe8983272
Remove link to non-existing page. Fixes #2620
2013-01-19 12:50:44 +02:00
Dmitriy Zaporozhets
3a1022e381
Increase Issue description size to 10k. Fixes #2545
2013-01-19 12:09:23 +02:00
Dmitriy Zaporozhets
569a88a456
raise exception if gitolite is broken
2013-01-19 11:58:36 +02:00
Dmitriy Zaporozhets
af7dcda1cb
Fix project creation
2013-01-18 22:23:11 +02:00
Dmitriy Zaporozhets
6f05ea4f6e
Improve CreateContext call. Fixed test
2013-01-18 20:21:13 +02:00
GitLab
232d61d598
Refactor project creation. Added logout link to profile page
2013-01-17 17:35:57 +02:00
Marin Jankovski
296cdd591f
Add optional signup.
2013-01-18 11:57:31 +01:00
Dmitriy Zaporozhets
bf753e99e7
Improve link to comment targets on dashboard
2013-01-17 22:54:02 +02:00
Dmitriy Zaporozhets
4bb1664aae
Merge pull request #2649 from tjeezy/patch-1
...
Eliminate horizontal shifting on diff body heights
2013-01-17 12:38:58 -08:00
Dmitriy Zaporozhets
2e9c0e2b47
switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment
2013-01-17 22:35:45 +02:00
TJ Koblentz
f65713dfa6
Eliminate horizontal shifting on diff body heights
2013-01-17 11:35:35 -08:00
Dmitriy Zaporozhets
b08bb20979
Fix assign-to-me filter for project issues
2013-01-17 13:11:53 +02:00
GitLab
9115a4f92f
Remove satellites when moving namespace
2013-01-17 12:21:52 +02:00
Riyad Preukschas
9bc829d397
Fix markdown for note events
2013-01-16 23:03:21 +01:00
Riyad Preukschas
16b5417842
Use image Urls for Emoji in GFM
...
Fixes #2617
2013-01-16 22:39:45 +01:00