Dmitriy Zaporozhets
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
Andrey Janzen
34ea7fdb36
fix typo
2012-03-12 09:02:05 +07:00
Dmitriy Zaporozhets
94befdd502
Events improved. Open/close issue, merge request events displayed
2012-03-07 00:13:43 -08:00
Abhi Devireddy
1bc0bd3244
Adapt to new web_hook_data method
...
Uses the first key that the user has for testing post receive hook.
2012-03-06 22:26:39 -06:00
Dmitriy Zaporozhets
cb59aade4e
Cleaning and refactoring
2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets
0727edd8a0
Removed issues,mr delete buttons. Refactored models
2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets
6de7dc1e67
New projects page
2012-03-03 00:09:17 +02:00
Dmitriy Zaporozhets
5263dd4297
Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled
2012-03-01 22:43:04 +02:00
Dmitriy Zaporozhets
c94159ab08
improved dashboard
2012-03-01 20:40:32 +02:00
Dmitriy Zaporozhets
bb164ebf1b
Send author to post hook. Display push activity to dashboard
2012-02-29 22:38:24 +02:00
Dmitriy Zaporozhets
376bec26de
Added dashboard page. Projects page not root from now
2012-02-28 22:59:36 +02:00
Dmitriy Zaporozhets
cd5c4bac50
notes count for wall
2012-02-27 20:34:55 +02:00
Dmitriy Zaporozhets
8470d70da6
notes controller refactored
2012-02-27 20:29:27 +02:00
Dmitriy Zaporozhets
1e689bfba3
fixed notes logic
2012-02-27 19:05:27 +02:00
Dmitriy Zaporozhets
460eeb13b7
Increased count of notes loaded when visit wall page
2012-02-24 22:48:27 +02:00
Dmitriy Zaporozhets
292a41cbe2
Fixed comments for snippets. Tests fixed
2012-02-24 22:36:44 +02:00
Dmitriy Zaporozhets
d41d8ffb02
Reply button, Comments for Merge Request diff
2012-02-24 22:19:47 +02:00
Dmitriy Zaporozhets
215a01f63c
move notes login to one controller
2012-02-24 09:16:06 +02:00
Dmitriy Zaporozhets
81092c0198
Status codes for errors, New error pages
2012-02-23 21:04:20 +02:00
Dmitriy Zaporozhets
7d279f9302
better error handling for not found resource, gitolite error
2012-02-22 07:14:54 +02:00
Dmitriy Zaporozhets
8c40aab120
Abilities extended. Resources security improved
2012-02-22 00:31:18 +02:00
Dmitriy Zaporozhets
9803e0885e
Project sidebar improved
2012-02-21 22:46:34 +02:00
Dmitriy Zaporozhets
ce8eba8913
Merge branch 'wiki'
...
Conflicts:
app/views/layouts/_project_menu.html.haml
2012-02-21 20:32:43 +02:00
Dmitriy Zaporozhets
49d58492f2
Wiki abilities
2012-02-20 21:16:55 +03:00
vsizov
bdc42488e9
wiki is done
2012-02-20 20:16:55 +03:00
Dmitriy Zaporozhets
5f4a7c3e04
Home tab added, Repository tab removed\n Ability to download branch
2012-02-20 08:38:03 +02:00
Valery Sizov
85974948e7
Wiki: history
2012-02-19 21:52:05 +02:00
Valery Sizov
57271da612
Wiki: design fixed
2012-02-19 19:50:13 +02:00
Valery Sizov
4c1b8558df
Wiki: base implemetation logic
2012-02-19 19:50:13 +02:00
Valery Sizov
eacea15a21
wiki base sceleton
2012-02-19 19:50:13 +02:00
Valeriy Sizov
a44b85be9e
Merge pull request #422 from steveprentice/master
...
This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP).
2012-02-19 03:45:55 -08:00
Dmitriy Zaporozhets
94db8a1c33
Usability & design improvements
2012-02-18 14:12:48 +02:00
Steve Prentice
2bb2dee057
Use the omniauth-ldap info object instead of the raw ldap info in extra.
...
This helps with compatibility with more LDAP providers as the implementation
doesn't depend on the exact names of the LDAP fields. The LDAP strategy
helps maps the attributes to the fields in the info object and we use the
info object to get the email and name.
This makes the LDAP auth compatible with most OpenLDAP servers as well.
2012-02-17 09:10:50 -08:00
Dmitriy Zaporozhets
1c62ec09b0
4 roles permission system
2012-02-16 09:03:55 +02:00
Dmitriy Zaporozhets
dac7c44ab3
Updated readme, Roles in progress
2012-02-15 23:51:04 +02:00
Dmitriy Zaporozhets
37224dc9c1
ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only
2012-02-15 22:02:33 +02:00
Dmitriy Zaporozhets
8d493019c4
Show commits for merge request immediatly
2012-02-15 01:15:02 +02:00
Dmitriy Zaporozhets
ef396d08fc
Fixed encoding issue for diff. Reordered merge request commits
2012-02-15 00:41:51 +02:00
Dmitriy Zaporozhets
a7bcc2eb5c
submodules displayed for tree view
2012-02-14 23:48:42 +02:00
Dmitriy Zaporozhets
ece9f50fb1
fixed unworking infinite scroll
2012-02-12 23:52:27 +02:00
Dmitriy Zaporozhets
cc043f32d8
Admin area improved
2012-02-11 19:56:18 +02:00
Dmitriy Zaporozhets
4d89322d67
Snippets - fixed after bootstrap
...
Project - restyled show page, removed info page
Repository - restyled show page, added download option
Tags - added download options
2012-02-08 01:00:49 +02:00
Dmitriy Zaporozhets
3d77183c16
Fix encoding issues for compare view
2012-02-07 19:21:16 +02:00
Dmitriy Zaporozhets
422e43989b
Compare view for commits
2012-02-06 22:32:04 +02:00
Dmitriy Zaporozhets
6c416aaac8
Issues, MR, Wall can be enabled/disabled per project
2012-02-06 19:40:32 +02:00
Dmitriy Zaporozhets
e64a174968
project membership widget. css fixes
2012-02-05 21:26:04 +02:00
Dmitriy Zaporozhets
0f83558bea
fixed branch switch for code view
2012-02-05 12:23:14 +02:00
Dmitriy Zaporozhets
8ebfae9a07
Merge branch 'bootstrap'
...
Conflicts:
Gemfile
app/views/commits/_commits.html.haml
app/views/projects/empty.html.haml
2012-01-30 00:45:35 +02:00
Dmitriy Zaporozhets
fca1ffb888
Bootstrap: Issues, Merge Requests, SSH Key completed
2012-01-29 23:59:12 +02:00
Dmitriy Zaporozhets
ae5faf0fd3
Ajax branch/tag switch for tree view
2012-01-29 21:30:03 +02:00
Dmitriy Zaporozhets
0a4222fb98
Bootstrap: Activities
2012-01-28 16:47:55 +02:00
vsizov
d6a0b8f428
LDAP done
2012-01-28 16:23:17 +03:00
Valery Sizov
c083df0570
LDAP BASE IMPLEMENRTATION
2012-01-28 13:11:21 +03:00
Dmitriy Zaporozhets
c7933d7a78
Bootstrap: team
2012-01-28 11:54:11 +02:00
Dmitriy Zaporozhets
1afd93ee1a
Bootstrap: cleaning commits css
2012-01-28 02:08:26 +02:00
Dmitriy Zaporozhets
29b5aa2c76
Bootstrap: Issues restyled
2012-01-28 01:49:14 +02:00
Dmitriy Zaporozhets
4647c6fa3a
fixes raw view for text files with code like *.rb
2012-01-25 15:27:36 +02:00
Dmitriy Zaporozhets
7157305d5e
cleaning dashboard & tags
2012-01-23 09:54:47 +02:00
Dmitriy Zaporozhets
e48a0b8eab
usability improvements
2012-01-21 23:17:29 +02:00
Dmitriy Zaporozhets
c5a48a6a90
add users to project from admin area easily
2012-01-21 19:03:47 +02:00
Dmitriy Zaporozhets
fa8c0c7813
Admin area: add multiple users to project
2012-01-21 18:06:14 +02:00
Dmitriy Zaporozhets
8c46123f99
fixed merge request diffissues 355, 351
2012-01-20 09:49:48 +02:00
Dmitriy Zaporozhets
15c4655527
UI: add new button, top panel restyle etc
2012-01-18 22:15:45 +02:00
Dmitriy Zaporozhets
b7614c714e
error messages restyled
2012-01-18 01:00:40 +02:00
Dmitriy Zaporozhets
c9ea5f1316
deploy key creation restyled
2012-01-18 00:46:13 +02:00
Dmitriy Zaporozhets
21b31a675d
Merge pull request #280 from vesln/password-present
...
Fixing an issue in users#update when password is not present.
2012-01-15 04:34:24 -08:00
Dmitriy Zaporozhets
d95cfc6144
started cleaning UI
2012-01-14 23:46:06 +02:00
Dmitriy Zaporozhets
1ee69714df
cleaning dashboard files
2012-01-14 21:44:08 +02:00
Dmitriy Zaporozhets
cbd78922ee
Merge branch 'deploy_keys'
...
Conflicts:
app/views/layouts/project.html.haml
db/schema.rb
2012-01-14 21:26:35 +02:00
Dmitriy Zaporozhets
6cf000ff52
Merge branch 'per_line_comment'
...
Conflicts:
app/assets/stylesheets/projects.css.scss
2012-01-12 00:42:17 +02:00
Veselin Todorov
22e7f8ffcc
Fixing an issue in users#update when password is not present.
2012-01-11 17:21:15 +02:00
Dmitriy Zaporozhets
c8b955a44b
lil restyle
2012-01-11 16:37:34 +02:00
Dmitriy Zaporozhets
9da4d06a87
per line comments display
2012-01-10 22:08:46 +02:00
Dmitriy Zaporozhets
7b0cd969e0
Merge branch 'web_hooks_scaffold'
2012-01-08 13:20:56 +02:00
Dmitriy Zaporozhets
473445c76f
complete hooks for post receive
2012-01-08 13:20:20 +02:00
Dmitriy Zaporozhets
57ac5fe99f
Procfile added. use foreman start to run gitlabhq
2012-01-08 12:20:24 +02:00
Dmitriy Zaporozhets
8a6bdf04c8
Merge pull request #264 from flixflax/remove_issue_fix
...
Redirect to issues list after deleting an issue in edit view
2012-01-06 00:35:23 -08:00
Felix Richter
10b6cb4d37
Redirect to issues list after deleting an issue in edit view
2012-01-04 13:47:57 +01:00
Dmitriy Zaporozhets
0ebc610e49
Project activities perfomance increased. Cache for project activitites disabled. Repository conception changed
2012-01-04 08:17:41 +02:00
Dmitriy Zaporozhets
2d3b6375f3
hooks scaffold
2012-01-04 02:07:56 +02:00
Dmitriy Zaporozhets
2dae0e18e0
web hooks scaffold started
2012-01-04 00:42:14 +02:00
miks
b8b6515f93
Renamed project "keys" back to "deploy_keys"
2011-12-31 19:37:14 +02:00
miks
99b8b577e9
DeployKey moved to Key model
2011-12-31 16:24:10 +02:00
Dmitriy Zaporozhets
a667c71312
repo branches and tags
2011-12-31 13:12:10 +02:00
Dmitriy Zaporozhets
0ae9ac155c
repo tab added. activities page for repo
2011-12-30 22:56:13 +02:00
Dmitriy Zaporozhets
61a2ce4110
code cleanin
2011-12-30 21:56:34 +02:00
Dmitriy Zaporozhets
0f627a65f4
Project tab r1 is finished
2011-12-30 08:54:42 +02:00
miks
b85ae02856
Only project admin have access to deploy_keys section
2011-12-29 23:46:18 +02:00
miks
f7b911d239
Path correction
2011-12-29 23:31:27 +02:00
miks
723104c45f
Initial deploy_key feature commit
2011-12-29 21:44:16 +02:00
Dmitriy Zaporozhets
c1c903fb95
Project tab added. activities, team, snippets moved to project tab
2011-12-28 09:38:50 +02:00
Cedric Gatay
c0b47d3245
Alert commit author on note
...
Allows to alert only the commit author when a new note is added on a commit, useful when gitlabhq is used for code
reviews, allows less noise with mails...
2011-12-24 17:28:20 +01:00
Dmitriy Zaporozhets
9a2a861276
Design tab for profile. Colorscheme as db value
2011-12-20 22:47:09 +02:00
Dmitriy Zaporozhets
6bdcaccb46
Revert "Handle back & forward events"
...
This reverts commit f80745b7db
2011-12-20 08:49:14 +02:00
Dmitriy Zaporozhets
f80745b7db
Handle back & forward events
2011-12-20 08:39:14 +02:00
Dmitriy Zaporozhets
321dbb7bac
removed project filter
2011-12-20 08:29:14 +02:00
Dmitriy Zaporozhets
cff9519127
Dashboard perfomance improved. Filter for projects page
2011-12-20 08:24:14 +02:00
Dmitriy Zaporozhets
a2d3b21189
User profile restyle. Feed(Atom) links for commits & issues
2011-12-19 23:32:59 +02:00
Dmitriy Zaporozhets
54fb0f8589
Merge branch 'notification_refactoring'
2011-12-19 15:17:11 +02:00
Valery Sizov
7713f7fefb
Notification refactoring
2011-12-17 15:58:35 +02:00
Dmitriy Zaporozhets
94b8c09c22
Merge pull request #214 from mutewinter/project_destroy_speed_fix
...
Project destroy relationship speed fix
2011-12-17 05:40:21 -08:00
Jeremy Mack
0bd7f91c66
Project destroy relationship speed fix
...
Removes destroy callback for users_projects when a project is destroyed.
This works okay becaues the gitolite config will be updated at at the
end to remove the entry entirely, thereby removing the users anyway.
2011-12-16 09:59:43 -05:00
Dmitriy Zaporozhets
ccc9bed893
Abilities refactoring
2011-12-15 23:57:46 +02:00
Dmitriy Zaporozhets
42c46f3720
Dashboard tabs restyle, messages if no issue or merge request
2011-12-15 09:22:24 +02:00
Dmitriy Zaporozhets
3a50b6cac9
merge request show page refactored
2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets
8426846d6d
fix default branch
2011-12-12 23:17:28 +02:00
Dmitriy Zaporozhets
cd779e56e1
dashboard v1
2011-12-08 22:17:53 +02:00
Dmitriy Zaporozhets
4107f2cc2e
mixed dashboard - first try
2011-12-08 21:17:53 +02:00
Dmitriy Zaporozhets
8e0126e9ec
Merge branch 'issue_dashboard' into improved_dashboard
2011-12-08 15:05:01 +02:00
Ariejan de Vroom
2b896ea6cc
Remove unused #search action
2011-12-08 08:59:15 +01:00
Ariejan de Vroom
e4b1f38c27
Added merge request dashboard, showing all merge requests assigned to
...
you across projects.
2011-12-08 01:07:02 +01:00
Ariejan de Vroom
f512418b27
Added "Issues" dashboard
...
This shows issues assigned to you, across all your projects, in one
place.
References #173
2011-12-08 00:31:06 +01:00
Dmitriy Zaporozhets
d68ec5e0fb
default_branch for project & fixed project destroy
2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets
1b8f082061
new access rights implemented
2011-12-07 10:04:57 +02:00
Dmitriy Zaporozhets
cb021e5831
repo & project access separated. critical gitolite bugfix
2011-12-07 01:27:07 +02:00
Dmitriy Zaporozhets
5c69f929d3
fix issue with first key add to new repo
2011-12-06 10:50:07 +02:00
Dmitriy Zaporozhets
bdc658095c
refcatoring. cleaning after gitosis
2011-12-05 09:43:53 +02:00
Dmitriy Zaporozhets
8134fe0efe
git host fixed
2011-12-05 09:23:53 +02:00
Dmitriy Zaporozhets
8f4a0bd174
fix filters & seeds
2011-12-04 22:34:39 +02:00
Dmitriy Zaporozhets
9e089efe5a
gitolite & gitosis support
2011-12-04 01:44:59 +02:00
Dmitriy Zaporozhets
79b64ef4ac
fixed merge request diff
2011-11-29 20:06:37 +02:00
Dmitriy Zaporozhets
e74ec3c95a
merge requests v1.0
2011-11-28 22:43:20 +02:00
Dmitriy Zaporozhets
8803fbb593
merge request: notes, diffs, commits
2011-11-28 22:16:57 +02:00
Dmitriy Zaporozhets
6b941cf92c
merge request list
2011-11-28 20:30:35 +02:00
Dmitriy Zaporozhets
6d460aa2d6
merge request entity
2011-11-28 09:39:43 +02:00
Dmitriy Zaporozhets
a031813887
Commit, network graph refactoring
2011-11-27 17:35:49 +02:00
Dmitriy Zaporozhets
8ad1f8a474
activities page caching
2011-11-27 14:53:12 +02:00
Dmitriy Zaporozhets
fb8f05ee16
activity events reduced to 20 from 40
2011-11-27 10:37:37 +02:00
Dmitriy Zaporozhets
32ebd438c2
Issue #263 - dont display ajax loader on commit page if commits < limit
2011-11-27 10:36:28 +02:00
gitlabhq
ee2d3de1a6
ability to attach branch to issue
2011-11-24 08:08:20 -05:00
Dmitriy Zaporozhets
b4c40c212c
removed activities page cache cause some bugs
2011-11-23 22:12:36 +02:00
gitlabhq
3f35cccfbd
ref controller refactored
2011-11-21 01:16:10 -05:00
Dmitriy Zaporozhets
4bf4efe712
decorators & tree model
2011-11-20 22:32:12 +02:00
gitlabhq
bb35ef2f60
fix branch/tag select
2011-11-16 12:19:18 -05:00
gitlabhq
af08ed6b66
refactoring
2011-11-16 08:38:53 +03:00
gitlabhq
f294b8d4c3
activity page cache
2011-11-15 10:47:24 -05:00
Nihad Abbasov
ed5e19a518
allow user to reset his private token
2011-11-15 17:08:20 +04:00
gitlabhq
12782adf03
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
2011-11-15 04:09:13 -05:00
gitlabhq
6b9f221a27
perfomance fix
2011-11-15 04:09:07 -05:00
Nihad Abbasov
368deb5992
clean up whitespace from project
2011-11-15 12:34:30 +04:00
Nihad Abbasov
415eddaf39
green specs
2011-11-15 12:13:59 +04:00
Nihad Abbasov
8d74123d61
Merge branch 'master' into features/feeds
2011-11-14 17:42:12 +04:00
Valery Sizov
762946995e
Merge remote-tracking branch 'origin/master' into network_graph
...
Conflicts:
app/assets/stylesheets/projects.css.scss
lib/commit_ext.rb
2011-11-13 15:57:34 +02:00
Valery Sizov
dc844f0138
Graph: small refactoring
2011-11-13 15:31:18 +02:00
Valery Sizov
94690bd2c4
Graph: base implementation
2011-11-13 13:58:45 +02:00
Valery Sizov
6b66a766d1
Graph: build json
2011-11-13 00:30:51 +02:00
Dmitriy Zaporozhets
2f790001a0
project -> show refactor
2011-11-12 16:28:14 +02:00
gitlabhq
49b2fb24bc
remove fluiod layout
2011-11-11 11:35:51 -05:00
gitlabhq
97cf5659aa
fixed layout as default
2011-11-11 10:57:16 -05:00
Nihad Abbasov
f295ff84d9
create atom feed for issues
2011-11-11 13:29:58 +04:00
