Saito
c62715acc9
now render the correct authorname and message
2012-05-30 12:11:03 +08:00
Saito
c71a76e71a
fix graph problem if authorname or message isnot utf8 encoding
2012-05-30 11:47:26 +08:00
Saito
e1d1673e74
monkey patch grit to support utf8 encoding
2012-05-29 16:17:31 +08:00
randx
3272620f72
lib/ refactoring. Module Gitlabhq renamed to Gitlab
2012-05-26 13:37:49 +03:00
Dmitriy Zaporozhets
8ceb94081a
[Travis] try run both db
2012-05-25 16:38:23 +03:00
Dmitriy Zaporozhets
1e4d15b406
Password & token split up, icon to button for top panel
2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
9cd8f7b082
New Feature: Git Blame for file
2012-05-17 19:11:45 +03:00
Dmitriy Zaporozhets
28cb43135c
Hooks UI improved, Request tests added
2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets
08994f3f60
Merge remote-tracking branch 'origin/merge_button'
...
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets
9c76bd9540
Project linguist integration
2012-04-21 01:26:22 +03:00
Arthur Schreiber
5b6019f357
Using github's linguist to better detect filetypes and to do syntax highlighting.
2012-04-20 23:21:12 +02:00
randx
35e21b3402
Admin dashboard
2012-04-20 19:41:49 +03:00
Dmitriy Zaporozhets
c9def945d4
User blocking improved. Admin area styled
2012-04-16 23:33:03 +03:00
Valery Sizov
8269a3a735
Auto-merge: checking via AJAX
2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets
95fde9bd7a
Projects page as dashboard. Old dashboard removed
2012-04-14 11:20:45 +03:00
Dmitriy Zaporozhets
b7558a2063
Removed encoding monkey patch
2012-04-11 23:03:56 +03:00
Dmitriy Zaporozhets
23d950855d
Milestone basic scaffold
2012-04-09 00:28:58 +03:00
Dmitriy Zaporozhets
b612497903
Fixed devise email_from, reordered initalizers
2012-04-06 01:28:37 +03:00
Dmitriy Zaporozhets
6e2a6d925f
cleanup after prev commit
2012-04-05 01:58:23 +03:00
Dmitriy Zaporozhets
80ddd2c09d
Better encoding handling. Updated grit
2012-04-05 01:51:49 +03:00
Abe Voelker
6aabf1157a
Move Unicorn unix socket out of /tmp
2012-04-01 14:44:12 -05:00
Dmitriy Zaporozhets
25924a9089
Email link https support
2012-03-31 15:59:06 +03:00
randx
78d620b3b6
Raw gitlab automerge feature
2012-03-29 18:03:05 +03:00
randx
69ef81404c
UI improved, .main_box css class for show pages
2012-03-28 10:46:51 +03:00
Valeriy Sizov
27cd6c758d
Merge pull request #585 from patthoyts/pt/omniauth-config
...
Move OmniAuth configuration details into a non-revision controlled file.
2012-03-27 13:13:07 -07:00
Ariejan de Vroom
474a42cfbd
Only load MySQL2Adapter connection fix is MySQL2 is available.
...
Useful for Sqlite or Postgres installations.
2012-03-27 16:59:25 +03:00
Yvan
2519ecf686
Changed for mysql2 adapter
2012-03-27 16:42:23 +03:00
Ariejan de Vroom
3b4e7b315b
Added fix for "MySQL has gone away" errors with Resque workers.
2012-03-27 15:17:23 +02:00
Pat Thoyts
6e27350aac
Move OmniAuth configuration details into a non-revision controlled file.
...
Provide an omniauth.rb.sample file to avoid encouraging end-users to commit
their provider access details (passwords or api tokens) into their git
repositories.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-03-23 15:35:55 +00:00
Dmitriy Zaporozhets
724ea16c34
Activities page added. Dashboard few specs. Preparing for 2.3
2012-03-19 22:52:16 +02:00
Dmitriy Zaporozhets
5d2bd5ec3a
Simple search implementation
2012-03-16 01:14:39 +02:00
Dmitriy Zaporozhets
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
Valery Sizov
529282d9de
unicorn: fix path to pid file
2012-03-11 17:49:09 +02:00
Valery Sizov
10887927af
added example config for unicorn
2012-03-10 16:57:43 +02:00
Dmitriy Zaporozhets
04e9022e5a
sqlite config example
2012-03-07 21:23:09 +02:00
Dmitriy Zaporozhets
55e72f4cdf
Gitlab moved to mysql
2012-03-06 19:54:59 +02:00
Dmitriy Zaporozhets
0727edd8a0
Removed issues,mr delete buttons. Refactored models
2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets
770f18ac50
Prevent Application from crash cause of charloc_cholmes error
2012-03-02 19:42:28 +03:00
Dmitriy Zaporozhets
0a0710a548
Event entity created
...
Observe issue, merge request, note creation - create event
register push event
2012-02-29 11:15:58 +02:00
Dmitriy Zaporozhets
376bec26de
Added dashboard page. Projects page not root from now
2012-02-28 22:59:36 +02:00
Dmitriy Zaporozhets
215a01f63c
move notes login to one controller
2012-02-24 09:16:06 +02:00
vsizov
bdc42488e9
wiki is done
2012-02-20 20:16:55 +03:00
Valery Sizov
85974948e7
Wiki: history
2012-02-19 21:52:05 +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
Dmitriy Zaporozhets
9edbac5ac8
Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
...
Conflicts:
.gitignore
2012-02-19 11:39:28 +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
bc3735004c
Moving to rails 3.2
2012-02-11 20:34:25 +02:00
Dmitriy Zaporozhets
cc043f32d8
Admin area improved
2012-02-11 19:56:18 +02:00
Saito
adcfeae161
Merge branch 'issue-331'
2012-02-10 10:59:32 +08: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
422e43989b
Compare view for commits
2012-02-06 22:32:04 +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
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
5c6417ce07
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-01-23 20:38:10 +02:00
Ariejan de Vroom
9696dff6e2
Added initializer to force Resque to wath the post_receive queue
2012-01-23 09:46:59 +01:00
Dmitriy Zaporozhets
7157305d5e
cleaning dashboard & tags
2012-01-23 09:54:47 +02:00
Dmitriy Zaporozhets
fa8c0c7813
Admin area: add multiple users to project
2012-01-21 18:06:14 +02:00
Dmitriy Zaporozhets
15c4655527
UI: add new button, top panel restyle etc
2012-01-18 22:15:45 +02:00
Dmitriy Zaporozhets
3b5a4fa2fd
fixed config
2012-01-18 13:47:45 +02:00
Dmitriy Zaporozhets
ccfae82723
project alert/error messages
2012-01-18 01:19:57 +02:00
Saito
ca23f27b5b
upload file's name support non-english words
2012-01-16 14:36:30 +08: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
caa5a78863
fixed database.yml
2012-01-08 13:32:35 +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
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
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
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
Saito
98b5c3647b
use monkey patch to trancoding content
2011-12-30 22:26:13 +08:00
Dmitriy Zaporozhets
0f627a65f4
Project tab r1 is finished
2011-12-30 08:54:42 +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
c1c903fb95
Project tab added. activities, team, snippets moved to project tab
2011-12-28 09:38:50 +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
Dmitriy Zaporozhets
9a2a861276
Design tab for profile. Colorscheme as db value
2011-12-20 22:47:09 +02:00
Dmitriy Zaporozhets
cff9519127
Dashboard perfomance improved. Filter for projects page
2011-12-20 08:24:14 +02:00
Valery Sizov
7713f7fefb
Notification refactoring
2011-12-17 15:58:35 +02:00
Ariejan de Vroom
1c9b9b7a3b
Added Resque as a dependency
2011-12-12 23:03:38 +01:00
Artiom Lunev
e74fae147a
rename database config to example
2011-12-12 21:49:40 +02:00
Artiom Lunev
86f76b11c6
rename gitlab config file to example
2011-12-12 21:47:00 +02:00
Jeremy Mack
926f3013c2
Updated validations and routes to support dots in project names
2011-12-12 13:13:11 -05:00
Dmitriy Zaporozhets
cd779e56e1
dashboard v1
2011-12-08 22:17:53 +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
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
3e581984fe
version updated, gitosis removed
2011-12-05 19:54:53 +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
a41d57691d
updated README
2011-12-04 01:52:19 +02:00
Dmitriy Zaporozhets
9e089efe5a
gitolite & gitosis support
2011-12-04 01:44:59 +02:00
Dmitriy Zaporozhets
c03bc6e291
gitolite support in progress | requires gitolite umask 0007
2011-12-04 01:08:08 +02:00
Dmitriy Zaporozhets
8803fbb593
merge request: notes, diffs, commits
2011-11-28 22:16:57 +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
367c4f42f0
one config file, git options added
2011-11-25 22:18:36 +02:00
Dmitriy Zaporozhets
9b3fabcc9a
mail host url to email.yml
2011-11-25 20:50:27 +02:00
Valery Sizov
d61268e4f1
[ #169 ] – Move email 'from' & 'host' settings to config file
2011-11-22 23:36:14 +02:00
gitlabhq
79bcdfb8d7
fix for branch names with '/'
2011-11-16 12:30:17 -05: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
Nihad Abbasov
ed5e19a518
allow user to reset his private token
2011-11-15 17:08:20 +04:00
Nihad Abbasov
d63f04ab16
nest issues actions in one route collection
2011-11-15 12:55:57 +04:00
Nihad Abbasov
368deb5992
clean up whitespace from project
2011-11-15 12:34:30 +04:00
Nihad Abbasov
003bf61258
add auth token for users
2011-11-15 11:08:05 +04:00
Valery Sizov
6b66a766d1
Graph: build json
2011-11-13 00:30:51 +02:00
lukasberns
a1fff682de
Add support for custom SSH ports
2011-11-12 08:30:42 +09:00
Aleksei Kvitinskii
6e08b5cc85
create tags page and made tag filter for projects
2011-11-05 21:00:05 +02:00
Aleksei Kvitinskii
1e5aa0efff
add tags autocomplete
2011-11-05 14:57:40 +02:00
gitlabhq
5c9cb850fc
dashboard is now root path
2011-11-03 07:00:16 -04:00
gitlabhq
485c5199b7
user dashboard
2011-10-31 22:57:16 +02:00
Nihad Abbasov
3f24f54061
install letter_opener
2011-10-31 16:20:41 +04:00
Nihad Abbasov
bd219fcc54
Merge branch 'refs/heads/assets-refactoring' into dev
2011-10-27 16:22:55 +05:00
Nihad Abbasov
2db09ada72
extend assets path with jquery-ui images, so rails can find them
2011-10-27 16:14:46 +05:00
Nihad Abbasov
f1e6d9be90
Merge branch 'assets-refactoring' into dev
...
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/index.html.haml
2011-10-26 23:35:17 +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
fb01f45890
issue search styleup
2011-10-26 07:34:02 +03:00
Adam Leonard
0955863489
Merge branch 'master' of dev.gitlabhq.com:gitlabhq into feature/issues_search
2011-10-25 18:34:59 -04:00
gitlabhq
5baa5fad0a
Issue #149
2011-10-24 22:38:03 +03:00
gitlabhq
b3279b9b51
moved from albino -> pygments.rb
2011-10-22 14:08:03 +03:00
Adam Leonard
5b284f6adf
Add ability to Search issues
2011-10-22 00:06:38 -04:00
gitlabhq
1477a6c8aa
moved from albino -> pygments.rb
2011-10-21 15:35:42 +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
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
ec9e54ea94
gitosis error handle
2011-10-10 00:15:28 +03:00
gitlabhq
9ba1224867
init commit
2011-10-09 00:36:38 +03:00
