vsizov
6572d96bb5
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-01-28 16:42:14 +03: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
7d750cbf79
Merge pull request #283 from veprbl/master
...
Display both author and committer in commits list
2012-01-27 11:15:24 -08:00
Dmitriy Zaporozhets
b4cc04d7e1
Commit diff fixes, per-line comments fixed
2012-01-25 21:10:09 +02:00
Dmitriy Zaporozhets
fa8c0c7813
Admin area: add multiple users to project
2012-01-21 18:06:14 +02:00
Dmitriy Zaporozhets
f4e3ec29c4
fixed commit commenting
2012-01-21 14:54:32 +02:00
Dmitriy Zaporozhets
3d7b35a37d
per line comment fix
2012-01-20 09:51:48 +02:00
Valery Sizov
fc36df92da
sql for mysql compatible
2012-01-19 21:44:10 +02:00
Dmitriy Zaporozhets
ccfae82723
project alert/error messages
2012-01-18 01:19:57 +02:00
Dmitriy Zaporozhets
e0fe17ee4a
cleaning & image resize
2012-01-15 17:59:40 +02:00
Dmitriy Zaporozhets
d95cfc6144
started cleaning UI
2012-01-14 23:46:06 +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
Dmitry Kalinkin
eb2a25f733
Added both committer and author display for commits list
2012-01-12 03:14:53 +04:00
Dmitriy Zaporozhets
9da4d06a87
per line comments display
2012-01-10 22:08:46 +02:00
Dmitriy Zaporozhets
70efc014e9
Merge branch 'project_activities'
2012-01-05 20:16:41 +02:00
VSizov
378ff10cfe
Merge remote-tracking branch 'origin/bug_322'
2012-01-05 19:07:47 +03:00
Dmitriy Zaporozhets
97ba731574
Project activities restyled
2012-01-04 22:19:41 +02:00
Dmitriy Zaporozhets
05993f90e0
removed tags from repo activities
2012-01-04 08:19:41 +02:00
Dmitriy Zaporozhets
0ebc610e49
Project activities perfomance increased. Cache for project activitites disabled. Repository conception changed
2012-01-04 08:17:41 +02:00
Valery Sizov
212f400d67
fix bug #322
2012-01-03 23:39:03 +02:00
Dmitriy Zaporozhets
8d7aaf0e55
Note on merge request open/close
2012-01-03 21:46:53 +02:00
Dmitriy Zaporozhets
a42a839ce5
Merge pull request #252 from CedricGatay/feature/note_on_issue_status_changed
...
Added note when issue status changed (closed / reopened)
2012-01-03 11:34:16 -08: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
miks
5b4382e12e
Validate key uniqueness across Key and DeployKey tables
2011-12-30 21:59:59 +02:00
Saito
14023c4e5a
remove charencode.
2011-12-30 21:41:39 +08:00
Cedric Gatay
e562129490
Added note when issue status changed (closed / reopened)
...
Implementation is correctly done through observer.
2011-12-29 22:42:31 +01:00
miks
753d4cb25e
Pass correct parameters
2011-12-29 23:09:46 +02:00
miks
3a597db773
Merge deploy keys identifier with read only keys
2011-12-29 23:08:26 +02:00
miks
f8ad4d2b42
Merge branch 'master' into deploy_keys
...
Conflicts:
app/models/project.rb
2011-12-29 21:46:21 +02:00
miks
723104c45f
Initial deploy_key feature commit
2011-12-29 21:44:16 +02:00
Dmitriy Zaporozhets
a6c937a779
temp fix for project hooks
2011-12-28 09:08:40 +02:00
Valery Sizov
66fb3909a5
Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks
...
Conflicts:
app/models/project.rb
config/routes.rb
db/schema.rb
2011-12-27 23:21:26 +02:00
Ariejan de Vroom
5ca836048d
Use URI::regexp for validating WebHook urls
2011-12-26 10:12:09 +01: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
2f7b671619
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2011-12-20 19:36:23 +02:00
Jeremy Mack
8a1deea586
Fixes timeout when adding an SSH key
...
Users with many projects (>100) will hit the 20 second timeout when
updating the gitolite config. This fix batches those changes into a
signle update to the file, causing an order of magnitude speed increase
which finishes well below the 20 second timeout.
Fixes gitlabhq/gitlabhq#220
2011-12-20 10:07:55 -05:00
Dmitriy Zaporozhets
cff9519127
Dashboard perfomance improved. Filter for projects page
2011-12-20 08:24:14 +02:00
Valery Sizov
6d5c969872
Merge branch 'limit_repo'
2011-12-20 00:07:49 +02:00
Valery Sizov
a6c88d4d84
fix project limit
2011-12-20 00:07:05 +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
c940767f2a
Notification:: small refactoring
2011-12-18 16:36:30 +02:00
Valery Sizov
6a0defc3ca
notification for note for merge request
2011-12-18 16:29:58 +02:00
Valery Sizov
a66d9b4c76
annotate model
2011-12-18 16:09:16 +02:00
Valery Sizov
32aa2e3f24
notification when assignee issue changed
2011-12-18 16:07:47 +02:00
Valery Sizov
df5b192e4d
notification when merge request reassigned
2011-12-18 15:46:06 +02:00
Dmitriy Zaporozhets
10df55e11d
Added missing dependent for notes assoc
2011-12-18 12:10:20 +02:00
Valery Sizov
db582b6383
Notification when created merge request
2011-12-17 18:07:28 +02:00
Valery Sizov
7713f7fefb
Notification refactoring
2011-12-17 15:58:35 +02:00
Dmitriy Zaporozhets
ccc9bed893
Abilities refactoring
2011-12-15 23:57:46 +02:00
Ariejan de Vroom
7ffb8fc616
Added specs for special cases
...
We don't execute web hooks when:
* You create a new branch. Make sure you first create the branch, and then push any commits. This is the way Github works, so its expected behavior.
* When tags are pushed.
2011-12-15 10:33:20 +01:00
Dmitriy Zaporozhets
0712e78597
Snippet restyle
2011-12-15 08:12:24 +02:00
Ariejan de Vroom
edab46e9fa
Added web hooks functionality
...
This commit includes:
* Projects can have zero or more WebHooks.
* The PostReceive job will ask a project to execute any web hooks defined for that project.
* WebHook has a URL, we post Github-compatible JSON to that URL.
* Failure to execute a WebHook will be silently ignored.
2011-12-14 17:38:52 +01:00
Dmitriy Zaporozhets
6f32ccf432
merge_requests restyle with forms
2011-12-13 23:56:04 +02:00
Ariejan de Vroom
56fc53e8d8
Automatically write hooks when updating a repository.
2011-12-13 20:39:02 +01:00
Ariejan de Vroom
bc0155fbaa
First attempt at a post-receive hook that posts directly to Resque
2011-12-13 01:03:26 +01:00
Jeremy Mack
a3b6a3ed35
Updated error messages to include dot as valid character
2011-12-12 13:32:35 -05:00
Jeremy Mack
926f3013c2
Updated validations and routes to support dots in project names
2011-12-12 13:13:11 -05:00
Dmitriy Zaporozhets
8e0126e9ec
Merge branch 'issue_dashboard' into improved_dashboard
2011-12-08 15:05:01 +02: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
Dmitriy Zaporozhets
23a1ba7362
Fix different styles/button positions
2011-12-08 01:35:57 +02:00
Dmitriy Zaporozhets
d68ec5e0fb
default_branch for project & fixed project destroy
2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets
68154e8fe9
spec fix
2011-12-07 09:48:44 +02:00
Dmitriy Zaporozhets
cb021e5831
repo & project access separated. critical gitolite bugfix
2011-12-07 01:27: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
03e51c3058
fixtures added
2011-12-04 22:19:49 +02:00
Dmitriy Zaporozhets
9e089efe5a
gitolite & gitosis support
2011-12-04 01:44:59 +02:00
gitlabhq
6a2c7d80cb
fixed image preview
2011-12-01 09:16:53 -05:00
Dmitriy Zaporozhets
79b64ef4ac
fixed merge request diff
2011-11-29 20:06:37 +02:00
Dmitriy Zaporozhets
958497fecb
fix issue count
2011-11-28 23:34:24 +02:00
Dmitriy Zaporozhets
22ac0cc7eb
Merge branch 'feature/merge_requests'
2011-11-28 22:43:42 +02:00
Saito
46cbe54189
fix the issue on github #157 .
...
directly force_encoding is wrong,
must detect the file string's encoding.
then force_encoding the string to it's encoding.
last convert it to utf-8.
2011-11-28 17:46:41 +08: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
gitlabhq
ee2d3de1a6
ability to attach branch to issue
2011-11-24 08:08:20 -05:00
Valery Sizov
540d0aa406
fixd key length
2011-11-22 21:56:22 +02:00
gitlabhq
3f0d807955
file name overflow fixed
2011-11-22 07:50:47 -05: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
ccefc95e12
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2011-11-18 04:18:26 -05:00
Drew
91d5a906f9
Resolved issue #235
2011-11-18 01:52:13 -05:00
Drew
15016ae68d
resolved issue 244 and updated test
2011-11-18 01:32:22 -05:00
Nihad Abbasov
c4a575b70b
Merge pull request #105 from SaitoWu/annotate
...
annotate models
2011-11-16 09:50:05 -08:00
Saito
7b5fd14515
annotate models
2011-11-16 16:32:35 +08:00
gitlabhq
af08ed6b66
refactoring
2011-11-16 08:38:53 +03: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
7b36b8d130
access project feeds via private token
2011-11-15 11:25:26 +04:00
Nihad Abbasov
003bf61258
add auth token for users
2011-11-15 11:08:05 +04:00
Dmitriy Zaporozhets
4dd5d9c8cc
Issue #185 – Show branch name for commits on activities & dashboard pages
2011-11-12 15:18:56 +02:00
lukasberns
a1fff682de
Add support for custom SSH ports
2011-11-12 08:30:42 +09:00
Dmitriy Zaporozhets
d730e3ef8b
refactoring project, commits controllers
2011-11-11 01:28:26 +02:00
Dmitriy Zaporozhets
dab072c1ab
refactor code: repository.rb
2011-11-11 00:51:33 +02:00
Dmitriy Zaporozhets
4ecf17cf9a
annotated
2011-11-11 00:08:20 +02:00
Dmitriy Zaporozhets
9a5f328313
notes should depends on user when destroy
2011-11-10 09:46:04 +02:00
Dmitriy Zaporozhets
b4868a8972
Improved commit author detection
2011-11-06 22:38:08 +02:00
Aleksei Kvitinskii
6977150f04
integrate tags plugins
2011-11-04 09:44:43 +02:00
Aleksei Kvitinskii
5d526717d6
increase max size of public to 1600 bytes
2011-11-04 01:16:12 +02:00
gitlabhq
3abd977822
fixed error with ascii error for dashboard
2011-11-03 06:56:26 -04:00
gitlabhq
020e1a8eee
dashboard
2011-11-02 22:14:03 +02:00
gitlabhq
485c5199b7
user dashboard
2011-10-31 22:57:16 +02:00
gitlabhq
3fa770dd10
Merge branch 'new_issue' into dev
2011-10-28 12:26:25 +03:00
Nihad Abbasov
89fa800e28
Merge branch 'refs/heads/snippets_expiration' into dev
...
Conflicts:
db/schema.rb
2011-10-28 00:28:37 +05:00
Nihad Abbasov
b6cdd1c819
test expired snippets
2011-10-28 00:25:50 +05:00
gitlabhq
56d9761844
moving out of body
2011-10-27 18:46:30 +03:00
gitlabhq
9611a27e0c
note as text
2011-10-27 17:33:20 +03:00
Nihad Abbasov
325b84545c
don't count expired snippets
2011-10-27 13:12:12 +05:00
Nihad Abbasov
000c032482
display recent snippets at top
2011-10-27 12:14:50 +05:00
Nihad Abbasov
8e1e17763f
implement snippets lifetime
2011-10-27 11:46:21 +05:00
Nihad Abbasov
d62200cad4
clean-up code
...
* Remove trailing whitespace
* Converts hard-tabs into two-space soft-tabs
* Remove consecutive blank lines
2011-10-26 18:46:25 +05:00
gitlabhq
9afee5ad52
Add critical status to issues
2011-10-25 07:34:02 +03:00
gitlabhq
72d15cc7ca
error fields highlight
2011-10-22 14:08:03 +03:00
gitlabhq
1a9531c9a4
fix #140 , commit lil refactor
2011-10-22 14:08:03 +03:00
gitlabhq
b3279b9b51
moved from albino -> pygments.rb
2011-10-22 14:08:03 +03:00
gitlabhq
24f04c0a61
recent radio button
2011-10-22 14:08:02 +03:00
gitlabhq
c66c30c821
Add check to ensure that a team member has atleast one Access Role selected
2011-10-22 14:08:02 +03:00
gitlabhq
c463eeb090
refactoring
2011-10-20 22:00:00 +03:00
Aleksei Kvitinskii
59704f481e
extended user profile with social fields
2011-10-20 01:34:05 +03:00
Zevs
85265b1bac
#40 max key length
2011-10-18 23:22:04 +03:00
gitlabhq
1a03b17ab5
dsaboard
2011-10-18 17:44:43 +03:00
gitlabhq
c29b49de66
project dashboard
2011-10-18 14:33:30 +03:00
gitlabhq
5a5845e490
few fixes
2011-10-18 11:21:44 +03:00
gitlabhq
d03f2687c5
annotated
2011-10-17 18:31:21 +03:00
gitlabhq
783ca89796
security improved
2011-10-17 13:39:03 +03:00
gitlabhq
9265de3d25
snippets are ready
2011-10-17 00:07:10 +03:00
gitlabhq
99777cab2a
Merge branch 'issue_im'
...
Conflicts:
config/initializers/rails_footnotes.rb
2011-10-15 20:54:39 +03:00
VSizov
dd833d28ad
Sortable issues
2011-10-15 19:56:53 +03:00
gitlabhq
57baa49bc3
project path & code regexp validation
2011-10-15 19:30:56 +03:00
gitlabhq
eefe826f83
project tile view
2011-10-12 16:19:14 +03:00
gitlabhq
035196e7a8
test fix
2011-10-09 22:36:57 +03:00
Valera Sizov
67f0c62d07
Issue #83 - Project limit
2011-10-09 11:15:01 -07:00
Valera Sizov
9840102651
Issue #82 - Add owner to project
2011-10-09 04:05:31 -07:00
gitlabhq
9ba1224867
init commit
2011-10-09 00:36:38 +03:00
