Dmitriy Zaporozhets
6cf000ff52
Merge branch 'per_line_comment'
...
Conflicts:
app/assets/stylesheets/projects.css.scss
2012-01-12 00:42:17 +02:00
Dmitriy Zaporozhets
99bb4a153d
per line comments w/o tests & with dirty code
2012-01-12 00:26:01 +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
c66bc99fb7
repo feed to partial
2012-01-10 20:06:41 +02:00
Dmitriy Zaporozhets
3c9d7b7077
Procfile production, resque script
2012-01-09 13:30:19 +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
Valery Sizov
a3efa43062
Merge branch 'feature_312'
2012-01-07 13:24:27 +02:00
Valery Sizov
09caa7c8ad
More descriptive subject in notification message
2012-01-07 13:03:31 +02:00
Valery Sizov
97e74c5bde
Auto-populate the path and code on the name input's onchange event to the sluggified version of name
2012-01-07 12:53:01 +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
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
Felix Richter
10b6cb4d37
Redirect to issues list after deleting an issue in edit view
2012-01-04 13:47:57 +01: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
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
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
e29b7d52fc
Merge pull request #256 from shtirlic/delete_dot_directory_files
...
Delete .directory files
2012-01-03 11:38:49 -08: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
shtirlic
2eb56e3d18
Delete .directory files
2012-01-01 21:37:32 +04:00
Dmitriy Zaporozhets
2c1b06a10f
Merge branch 'feature/repository_tab'
2011-12-31 13:13:23 +02:00
Dmitriy Zaporozhets
a667c71312
repo branches and tags
2011-12-31 13:12:10 +02:00
Dmitriy Zaporozhets
d8247012b5
repositories tab specs
2011-12-31 12:52:01 +02:00
Dmitriy Zaporozhets
d34904b86c
Merge branch 'grit_ext'
2011-12-30 23:20:16 +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
Saito
14023c4e5a
remove charencode.
2011-12-30 21:41:39 +08:00
Dmitriy Zaporozhets
0f627a65f4
Project tab r1 is finished
2011-12-30 08:54:42 +02: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
Dmitriy Zaporozhets
c1c903fb95
Project tab added. activities, team, snippets moved to project tab
2011-12-28 09:38:50 +02:00
Dmitriy Zaporozhets
6e5caa1985
favicon updated
2011-12-28 09:18:50 +02:00
Dmitriy Zaporozhets
a6c937a779
temp fix for project hooks
2011-12-28 09:08:40 +02:00
Valery Sizov
de83c91c2f
small redesign of controls of notes
2011-12-28 01:29:53 +02:00
Valery Sizov
49b5805709
commit helper refactoring
2011-12-28 01:06:55 +02:00
Valeriy Sizov
5d6e79f4b9
Merge pull request #237 from CedricGatay/feature/expand_issues_ref_in_commit
...
Autolinks to issues in commit message (see #155 )
2011-12-27 14:49:38 -08:00
Valeriy Sizov
47d5d5f5db
Merge pull request #203 from mlitwiniuk/top_nav_fix
...
Hide admin menu for non-admins
2011-12-27 14:33:38 -08: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
Cedric Gatay
0aef2fe437
I have to domesticate RubyMine, keymapping is not the same as IntelliJ and I have deleted a character by mistake...
2011-12-27 00:40:16 +01:00
Cedric Gatay
89a03a3453
1/ rspec'ed
...
2/ @commit.safe_message as an argument
3/ preserve in helper
4/ spaces around operators
2011-12-27 00:37:27 +01:00
Cedric Gatay
5d9f2e7d15
Follow up of my pull request, damn last time refactor !
2011-12-26 21:44:04 +01:00
Cedric Gatay
443e21ed92
Autolinks to issues in commit message (see #155 )
...
It matches #[0-9]+ in commit messages.
For example
* Fix for #12
* Code review for #56
* Test for #15 , Review on #54 , Fix for #42
It only links to valid issues (existing and belonging to the current project)
It does not add any link to the commit in the issue page, it only consists in parsing the commit message when displayed.
This can be considere as a primary work for the issue #155 on gitlabhq/gitlabhq.
2011-12-26 21:36:20 +01:00
Ariejan de Vroom
5ca836048d
Use URI::regexp for validating WebHook urls
2011-12-26 10:12:09 +01:00
Dmitriy Zaporozhets
53ce00f74a
Merge pull request #231 from CedricGatay/feature/commit_author_mail_for_note
...
Alert only commit author on note
2011-12-25 03:41:47 -08:00
Dmitriy Zaporozhets
bac0fa2c28
Merge pull request #215 from mutewinter/missing_favicon_link
...
Added missing link to favicon
2011-12-25 03:27:51 -08:00