deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2754 commits 6 branches 43 tags 25 MiB
Commit graph

1672 commits

Author SHA1 Message Date
Dmitriy Zaporozhets f86df73c1a removed dots from menu, renamed Code to Files 2012-02-08 19:18:38 +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
miks f5a16663f0 Improved validation. Strip key. 2012-02-08 00:32:20 +02:00
miks e3e9db9509 Allow non-unique deploy keys 2012-02-07 23:58:51 +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 da3e34c0fd per-line comments css fixes 2012-02-06 02:15:45 +02:00
Dmitriy Zaporozhets 5134aa971c fixed ability to edit team member access 2012-02-06 01:56:26 +02:00
Dmitriy Zaporozhets e64a174968 project membership widget. css fixes 2012-02-05 21:26:04 +02:00
Dmitriy Zaporozhets 96b53a9f59 Menlo font added to fix code preview for osx 2012-02-05 19:12:14 +02:00
Dmitriy Zaporozhets 419368f4f4 fix empty page after broken pull request 2012-02-05 19:01:13 +02:00
Dmitriy Zaporozhets 911abedf25 Merge pull request #292 from si14/patch-1 
line numbers are now non-selectable
 2012-02-05 08:35:41 -08:00
Dmitriy Zaporozhets cddf61ef3b Merge pull request #363 from druidvav/master 
Lexer корёжит имена пользователей на русском языке
 2012-02-05 08:30:12 -08:00
Dmitriy Zaporozhets 2efc1068f0 css fixes for .entry class 2012-02-05 13:51:51 +02:00
Dmitriy Zaporozhets c90f1d5c8b fixed issue, mr crash if assignee/author removed from team 2012-02-05 12:58:02 +02:00
Dmitriy Zaporozhets 5a12bee37d fix 500 on project page after someone leave note on wall 2012-02-05 12:26:27 +02:00
Dmitriy Zaporozhets 0f83558bea fixed branch switch for code view 2012-02-05 12:23:14 +02:00
druidvav 03bf55846b Fix for utf-8 names in empty project page. 2012-02-01 14:42:42 +04: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 b51252e6ca Bootstrap: test fixes 2012-01-30 00:43:14 +02:00
Dmitriy Zaporozhets fca1ffb888 Bootstrap: Issues, Merge Requests, SSH Key completed 2012-01-29 23:59:12 +02:00
Dmitriy Zaporozhets 20721eff1c Bootstrap: Commits page 2012-01-29 21:58:31 +02:00
Dmitriy Zaporozhets ae5faf0fd3 Ajax branch/tag switch for tree view 2012-01-29 21:30:03 +02:00
Dmitriy Zaporozhets 97e9774336 fixed tree view 2012-01-29 12:45:51 +02:00
Dmitriy Zaporozhets a77c8bf9c3 Bootstrap: Issues & MR 2012-01-29 12:04:09 +02:00
Dmitriy Zaporozhets d81f0b7845 Bootstrap: Merge Request -> Show 2012-01-28 17:21:00 +02:00
Dmitriy Zaporozhets 0a4222fb98 Bootstrap: Activities 2012-01-28 16:47:55 +02:00
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
Dmitriy Zaporozhets 15b06b0164 Bootstrap: Deploy keys, Hooks 2012-01-28 12:40:17 +02:00
Valery Sizov d885f24f7b delete unnecessary files 2012-01-28 13:11:21 +03:00
Valery Sizov c083df0570 LDAP BASE IMPLEMENRTATION 2012-01-28 13:11:21 +03:00
Dmitriy Zaporozhets 089dca4d6c Bootstrap: network graph 2012-01-28 12:02:03 +02: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 7f6e41fa02 Bootstrap: application layout 2012-01-28 00:51:02 +02: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 05d76fc4d0 Bootstrap: login screen 2012-01-27 19:58:10 +02:00
Dmitriy Zaporozhets 4d9c3f3123 Bootstrap: btn replacing 2012-01-27 09:19:55 +02:00
Dmitriy Zaporozhets fbdb1da2ab Bootstrap: issues, notes css 2012-01-27 08:57:55 +02:00
Dmitriy Zaporozhets d4ad362387 Bootstrap: commits page + tree 2012-01-27 01:46:32 +02:00
Dmitriy Zaporozhets bef29f0797 project, commits page with bootstrap 2012-01-27 00:13:19 +02:00
tomneedham 807721df73 fixed no ssh key message 2012-01-26 19:02:59 +00:00
Dmitriy Zaporozhets fed0da8076 Cleaning css. layout is broken 2012-01-26 19:25:35 +02:00
Dmitriy Zaporozhets ee2583e1b5 boostrap scss gem 2012-01-26 09:51:11 +02:00
Dmitriy Zaporozhets 15b1b51524 css refactoring & utf8 meta tag 2012-01-26 09:50:11 +02:00
Dmitriy Zaporozhets b4cc04d7e1 Commit diff fixes, per-line comments fixed 2012-01-25 21:10:09 +02:00
Dmitriy Zaporozhets 73efb83791 tags css refactored 2012-01-25 09:16:08 +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 ec1a426726 fixed double form 'Add new' for issues 2012-01-25 15:27:36 +02:00
Dmitriy Zaporozhets 16a98387c2 merge reques diff: files list displayed 2012-01-23 21:08:12 +02:00
Dmitriy Zaporozhets 7157305d5e cleaning dashboard & tags 2012-01-23 09:54:47 +02:00
Dmitriy Zaporozhets 611c5a87ab Version up to 2.1. Help page filled with simple workflow 2012-01-22 14:25:43 +02:00
Dmitriy Zaporozhets 3b91a103e0 keep current branch when switch from tree to commits 2012-01-22 13:21:59 +02:00
Dmitriy Zaporozhets 2cd5aa694d fixed ... in diff file first line 2012-01-22 13:13:15 +02:00
Dmitriy Zaporozhets 8ad7586aa7 updated font-family 2012-01-22 00:29:20 +02:00
Dmitriy Zaporozhets 44c38b3207 Merge pull request #318 from dfyx/patch-1 
Add missing header gradient for Opera
 2012-01-21 13:58:41 -08:00
Dmitriy Zaporozhets 3c2b3f3f56 Keep branch/tag when navigate from commits to tree 2012-01-21 23:57:47 +02:00
Dmitriy Zaporozhets e48a0b8eab usability improvements 2012-01-21 23:17:29 +02:00
dfyx ac689f8aa3 Add missing header gradient for Opera 2012-01-21 21:32:42 +01: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 f6f72d4b22 per line comment improved 2012-01-21 15:22:42 +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
Dmitriy Zaporozhets 8c46123f99 fixed merge request diffissues 355, 351 2012-01-20 09:49:48 +02:00
Dmitriy Zaporozhets fde29a82e6 fixed merge request add new link 2012-01-20 09:48:48 +02:00
Dmitriy Zaporozhets 0aa0cb7903 lil css fixed 2012-01-19 22:18:30 +02:00
Valery Sizov fc36df92da sql for mysql compatible 2012-01-19 21:44:10 +02:00
Dmitriy Zaporozhets 5e3b7314bd gitlab logo added to top panel 2012-01-19 21:00:50 +02:00
Dmitriy Zaporozhets 00d7bfda95 projects link added. security specs added 2012-01-19 09:27:23 +02:00
Dmitriy Zaporozhets 15c4655527 UI: add new button, top panel restyle etc 2012-01-18 22:15:45 +02:00
Dmitriy Zaporozhets ccfae82723 project alert/error messages 2012-01-18 01:19:57 +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 809413d9e7 minimalistic UI: issues index, css refactoring 2012-01-18 00:04:27 +02:00
Dmitriy Zaporozhets ffc6ab41e0 removed top line 2012-01-17 21:03:20 +02:00
Dmitriy Zaporozhets 0ad83a2172 css refactoring 2012-01-16 21:07:57 +02:00
Dmitriy Zaporozhets 8cc25ef94e cleaning UI 2012-01-15 22:36:32 +02:00
Dmitriy Zaporozhets 87f07f68bb new layout 2012-01-15 19:42:20 +02:00
Dmitriy Zaporozhets e0fe17ee4a cleaning & image resize 2012-01-15 17:59:40 +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 bed882e647 layout fixes 2012-01-15 12:27:55 +02:00
Dmitriy Zaporozhets 60af43b981 restored search input & project link added 2012-01-15 12:03:29 +02: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 09b877ef29 remove modal window from team member managment 2012-01-14 19:54:41 +02:00
Dmitriy Zaporozhets 458f9c5695 button selection improved 2012-01-13 23:24:16 +02:00
Dmitriy Zaporozhets 693ff1c644 dashboard restyled. colors improved 2012-01-13 23:13:44 +02:00
Dmitry Groshev 77164c7bbb line numbers are now non-selectable 2012-01-13 18:40:34 +04:00
Dmitriy Zaporozhets 0ba081947d prototype styled. home button added 2012-01-12 09:28:57 +02:00
Dmitriy Zaporozhets 74632d6aec lil color restyle 2012-01-12 09:08:57 +02:00
Dmitriy Zaporozhets 84d1dead66 new layout style 2012-01-12 09:04:57 +02:00
Dmitry Kalinkin eb2a25f733 Added both committer and author display for commits list 2012-01-12 03:14:53 +04:00
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
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 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
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 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
miks 5b4382e12e Validate key uniqueness across Key and DeployKey tables 2011-12-30 21:59:59 +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
miks b85ae02856 Only project admin have access to deploy_keys section 2011-12-29 23:46:18 +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
miks f7b911d239 Path correction 2011-12-29 23:31:27 +02: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 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
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
Gamaliel A. Toro Herrera 56243c0a63 Solved issue #188 2011-12-22 14:09:41 +01:00
Dmitriy Zaporozhets f9758c726f fixed activities date output for projects page 2011-12-21 09:48:23 +02: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 3d4f524dcb play with tree view 2011-12-20 08:59:14 +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
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 f09e15992f fix show token in profile 2011-12-18 18:09:59 +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 132177c2b7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-12-17 15:40:31 +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
Dmitriy Zaporozhets 6db121cbdb rename back button 2011-12-17 11:18:27 +02:00
Jeremy Mack ad0e02c9de Added missing link to favicon 2011-12-16 13:12:20 -05: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 fa3cb28cbe team member show page restyle 2011-12-16 00:41:46 +02:00
Dmitriy Zaporozhets ccc9bed893 Abilities refactoring 2011-12-15 23:57:46 +02:00
Dmitriy Zaporozhets f94d51d765 moved project remove button to edit section 2011-12-15 21:42:33 +02:00
Maciej Litwiniuk 36b7b5f299 hide admin menu for non-admins 2011-12-15 12:18:33 +01: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 42c46f3720 Dashboard tabs restyle, messages if no issue or merge request 2011-12-15 09:22:24 +02:00
Dmitriy Zaporozhets ed3f3a0d4d Download link for binary 2011-12-15 08:42:24 +02:00
Dmitriy Zaporozhets 0712e78597 Snippet restyle 2011-12-15 08:12:24 +02:00
Dmitriy Zaporozhets ca4e2ad135 Merge pull request #197 from artiom/187-dashboard-merge-request-indication 
Merge requests in dashboard state indication
 2011-12-14 10:53:50 -08:00
Dmitriy Zaporozhets e213f94985 Merge pull request #199 from jalada/master 
Image is broken on dashboard if deployed to a subdomain
 2011-12-14 10:53:31 -08: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
David Somers edece21e22 Use #image_tag for dashboard tabs throbber. 2011-12-14 15:24:39 +00:00
Dmitriy Zaporozhets ff1cbbc532 Issue restyle 2011-12-14 08:58:35 +02:00
Dmitriy Zaporozhets 87d9e0d88c Issue show page restyled 2011-12-13 23:59:35 +02:00
Dmitriy Zaporozhets 6f32ccf432 merge_requests restyle with forms 2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets 3a50b6cac9 merge request show page refactored 2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets e4bd6442a9 merge request js/css rewrite 2011-12-13 23:56:04 +02:00
Artiom Lunev 8187119eb0 add to merge requests in dashboard indication if closed or not fixes #187 2011-12-13 23:40:29 +02:00
Ariejan de Vroom 56fc53e8d8 Automatically write hooks when updating a repository. 2011-12-13 20:39:02 +01:00
Saito 713802fdf3 add plain text support,keep markdown and plain text in readme 2011-12-13 19:25:58 +08: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
Dmitriy Zaporozhets 3dc94ba8eb ajax-loader for dashboard 2011-12-13 00:08:15 +02:00
Dmitriy Zaporozhets 8426846d6d fix default branch 2011-12-12 23:17:28 +02:00
Dmitriy Zaporozhets 04a908f6a5 Merge pull request #190 from mutewinter/dot_project_names 
Allow dots in project names
 2011-12-12 13:03:38 -08:00
Dmitriy Zaporozhets 37a0a25f60 Merge pull request #185 from artiom/181-mergerequest-note-link 
fix merge request note link
 2011-12-12 13:02:36 -08:00
Dmitriy Zaporozhets 02e827283d increased breadcrumbs with & commit messages 2011-12-12 22:12:37 +02: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 faf7c79eb2 lil js refactoring 2011-12-12 20:08:04 +02:00
Dmitriy Zaporozhets 4df4b38185 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-12-12 19:23:01 +02:00
Dmitriy Zaporozhets 5bc97fbd3f middle panel 2011-12-12 19:22:01 +02:00
Saito 7b7549bea6 tree view readme support 2011-12-13 00:42:07 +08:00
Saito f615c877bc fix can not guess problem 2011-12-13 00:41:31 +08:00
Dmitriy Zaporozhets f34b1be281 dashboard tabs 2011-12-12 09:38:37 +02:00
Artiom Lunev 1b6fb006ca fix merge request note link 2011-12-12 00:18:51 +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 0ffed126e2 fixed tab highlighting for issues 2011-12-08 01:13:11 +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
Dmitriy Zaporozhets 2677bc3acb network graph header, fixed test 2011-12-08 01:45:36 +02:00
Ariejan de Vroom 1a3af33fce remove generated rails files 2011-12-08 00:39:32 +01:00
Dmitriy Zaporozhets 23a1ba7362 Fix different styles/button positions 2011-12-08 01:35:57 +02: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 72a13fcc2e changed color for commit tag 2011-12-08 00:31:04 +02:00
Dmitriy Zaporozhets c2789dae34 fix project creation 2011-12-08 00:22:46 +02:00
Dmitriy Zaporozhets d68ec5e0fb default_branch for project & fixed project destroy 2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets c7afad3187 increase wide of content area +20px 2011-12-07 22:39:14 +02:00
Dmitriy Zaporozhets 1b8f082061 new access rights implemented 2011-12-07 10:04: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 5c69f929d3 fix issue with first key add to new repo 2011-12-06 10:50:07 +02:00
Dmitriy Zaporozhets 1bf775d55d fixed commits links from tree view 2011-12-05 22:20:46 +02:00
Dmitriy Zaporozhets e14a0eb8d0 Merge branch 'gitolite' 2011-12-05 19:27:51 +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 da424d9406 css fixes 2011-12-02 05:57:18 -05:00
gitlabhq 6a2c7d80cb fixed image preview 2011-12-01 09:16:53 -05:00
Saito 42ba6d04f8 refactor each_line detect to detect all diff file 2011-12-01 15:59:49 +08:00
Dmitriy Zaporozhets c2cfc52e44 fix merge request diff 2011-12-01 01:51:16 +02:00
Dmitriy Zaporozhets 570f63daaf line links for commit diff, css fixed for line diff 2011-12-01 01:51:04 +02:00
Dmitriy Zaporozhets b60b7b2e2b restyle commit show page pt1 2011-12-01 00:24:28 +02:00
Dmitriy Zaporozhets fdc815961c content wider + 20px 2011-11-30 23:52:22 +02:00
Dmitriy Zaporozhets 1ce55d161a new team memeber selectbox replaced 2011-11-30 23:41:00 +02:00
Dmitriy Zaporozhets 46e77db099 some fixes to black colorscheme 2011-11-30 23:25:39 +02:00
Dmitriy Zaporozhets 6686834c8d fix spelling 2011-11-30 21:24:50 +02:00
Dmitriy Zaporozhets c34092ebdc fixed commit date 2011-11-30 21:23:17 +02:00
Saito 12c01d7401 fix encode bugs on diff not utf-8 encode's code 2011-11-30 15:05:37 +08:00
Dmitriy Zaporozhets f114a4f349 css fixes 2011-11-29 20:10:48 +02: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 017dfaee65 Issue sidebar counter should show count of assigned to you 2011-11-28 23:29:46 +02:00
Dmitriy Zaporozhets bfb0bdbe72 fixed link names 2011-11-28 23:14:43 +02:00
Dmitriy Zaporozhets 22ac0cc7eb Merge branch 'feature/merge_requests' 2011-11-28 22:43:42 +02:00
Dmitriy Zaporozhets e74ec3c95a merge requests v1.0 2011-11-28 22:43:20 +02:00
Dmitriy Zaporozhets fbba17603f merge requests - tab styleup 2011-11-28 22:38:11 +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
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 39a1b7d3f7 margin for notes content 2011-11-27 15:12:48 +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
Dmitriy Zaporozhets 814eeb45e6 fixed bg for dark file preview 2011-11-26 21:14:50 +02:00
Dmitriy Zaporozhets 3aee553523 colorscheme for code view 2011-11-26 01:42:42 +02:00
Dmitriy Zaporozhets 0accbaae15 snippets restyle 2011-11-26 00:19:14 +02:00
Dmitriy Zaporozhets a9928eae48 fixed sidebar zero count 2011-11-25 23:44:02 +02:00
Dmitriy Zaporozhets 15fa14f1d6 get rid off modal window for issue create/edit 2011-11-25 23:40:12 +02:00
Dmitriy Zaporozhets 16bd018f08 clickable news feed on dashboard 2011-11-25 22:26:44 +02:00
Dmitriy Zaporozhets 8209a2ff49 cleaning side menu 2011-11-25 21:56:05 +02:00
Dmitriy Zaporozhets 9b3fabcc9a mail host url to email.yml 2011-11-25 20:50:27 +02:00
gitlabhq a8e4fb6144 Merge branch 'feature/issue_with_branch' 2011-11-25 06:13:15 -05:00
gitlabhq 4aad057f23 issues style fixed 2011-11-25 05:49:28 -05:00
gitlabhq 4e55cc67f5 Issue show page restyled 2011-11-25 05:41:30 -05:00
Martin Knoll 07fefc9206 Fixes issue with logo linking to the server root, instead of the app root. 
If using multiple Rails apps in subfolders, the upper left "GITLAB" button links to '/' and thats kinda wrong.
This fix creates a link to the root_url instead, which works in every case.
 2011-11-25 01:01:58 +01:00
gitlabhq b7f4f67b9b issue show finished 2011-11-24 11:47:27 -05:00
gitlabhq 2fbf45b2e0 issue message output 2011-11-24 10:15:30 -05: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
Dmitriy Zaporozhets 21d566ea76 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-22 23:52:15 +02:00
Valery Sizov d61268e4f1 [#169] – Move email 'from' & 'host' settings to config file 2011-11-22 23:36:14 +02:00
Dmitriy Zaporozhets 7ebba27db2 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-22 23:15:09 +02:00
Valery Sizov a4fbe13fce [#243] – When user adds first key the add a key message should go away 2011-11-22 22:26:07 +02:00
Valery Sizov 540d0aa406 fixd key length 2011-11-22 21:56:22 +02:00
Dmitriy Zaporozhets b56024100d lil style fixes 2011-11-22 19:57:25 +02:00
Dmitriy Zaporozhets 4451b8df8a 3 events on dashboard, fixed issue gl#250 2011-11-22 19:54:36 +02:00
gitlabhq 86829cae50 fixed min height for menu 2011-11-22 09:03:27 -05:00
gitlabhq 3f56202713 dashboard replaced [event] by tag 2011-11-22 08:33:42 -05:00
gitlabhq 78e6dc5fa5 #222 2011-11-22 08:26:53 -05:00
gitlabhq b5d7fb5eed restyled user profile 2011-11-22 08:14:23 -05:00
gitlabhq 3f0d807955 file name overflow fixed 2011-11-22 07:50:47 -05:00
gitlabhq a59b709021 file code view restyled 2011-11-22 06:59:20 -05:00
gitlabhq 31e51dd116 button common style + flash messages fix 2011-11-21 02:26:10 -05:00
gitlabhq 46bebac983 commit restyle 2011-11-21 02:16:10 -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
Dmitriy Zaporozhets 6721ef01f4 fixed flash container 2011-11-20 20:30:00 +02:00
Alexander Randa 7c5e83c0c2 changing admin disign for userss update 2011-11-19 00:33:10 +03:00
Alexander Randa 84fc40f198 changing admin disign for projects update 2011-11-19 00:32:26 +03:00
Alexander Randa bc591f929d admin button style update 2011-11-19 00:31:06 +03:00
Alexander Randa 22be0785bd changing admin disign for users finish 2011-11-18 23:55:13 +03:00
Alexander Randa f950d7881c changing admin disign for projects finish 2011-11-18 23:54:56 +03:00
Alexander Randa 5488f17389 changet button disign 2011-11-18 23:54:06 +03:00
Alexander Randa 46d7ecacd7 table header align bugfix 2011-11-18 22:19:55 +03:00
Alexander Randa 0c19b1afd9 disabled empty notice 2011-11-18 22:10:07 +03:00
user ed63d28e7a Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into admin-panel-disign 2011-11-18 21:31:56 +03:00
Saito baa4fc8c17 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-11-18 20:58:25 +08:00
Saito 6bd9b90fb6 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-18 20:20:24 +08:00
Saito 4281704fb3 fix diff bug with utf-8 2011-11-18 20:16:59 +08:00
Saito 139c4c2f18 fix diff bug 2011-11-18 19:48:23 +08: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
Ricardo Rauch 2a874a00dc fixing aside on dashboard 2011-11-17 16:49:02 -03:00
Ricardo Rauch c0dbebb11d fixing error messages 2011-11-17 16:30:57 -03:00
Alexander Randa c3eac16fe9 update notice and show-info view 2011-11-17 01:19:00 +03:00
Alexander Randa 4dee4bdb57 change back button position when project creating 2011-11-17 00:22:18 +03:00
Alexander Randa 9987ec934c added 10px in bottom 2011-11-17 00:17:55 +03:00
Alexander Randa 459c9ba27d bugfix back button on page admin/project/new 2011-11-17 00:13:14 +03:00
Alexander Randa 930455f065 change the highlight color from pink to blue 2011-11-16 23:55:10 +03:00
Nihad Abbasov c4a575b70b Merge pull request #105 from SaitoWu/annotate 
annotate models
 2011-11-16 09:50:05 -08:00
gitlabhq c226558644 qfix broken css 2011-11-16 12:23:09 -05:00
gitlabhq bb35ef2f60 fix branch/tag select 2011-11-16 12:19:18 -05:00
gitlabhq aa02a3b757 fix projects page 2011-11-16 11:43:16 -05: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 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
Dmitriy Zaporozhets 32ca0b8cae Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-11-15 11:09:59 +02: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 dd64b761c6 move non-app assets to vendor 2011-11-15 12:45:15 +04: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 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
Nihad Abbasov 8d74123d61 Merge branch 'master' into features/feeds 2011-11-14 17:42:12 +04:00
Saito e2b4fe3538 fix project new link 2011-11-14 16:15:26 +08: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 c89682605f Graph: is done. v1 2011-11-13 15:12:52 +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
Dmitriy Zaporozhets 8786aff25a project avtivity page 2011-11-12 16:19:34 +02:00
Dmitriy Zaporozhets 4dd5d9c8cc Issue #185 – Show branch name for commits on activities & dashboard pages 2011-11-12 15:18:56 +02:00
Dmitriy Zaporozhets c1c64d985e css refactor 2011-11-12 14:45:32 +02:00
Dmitriy Zaporozhets ef08872534 css refactor 2011-11-12 13:04:43 +02:00
Dmitriy Zaporozhets 60f4576d5d top panel -> search -> css 2011-11-12 12:50:25 +02:00
Dmitriy Zaporozhets 48a1e31010 snippet table restyle 2011-11-12 12:41:34 +02:00
Dmitriy Zaporozhets 9d91378980 Merge pull request #91 from lukasberns/master 
Add support for custom SSH ports
 2011-11-12 01:45:51 -08:00
lukasberns a1fff682de Add support for custom SSH ports 2011-11-12 08:30:42 +09:00
Ricardo Rauch d5da9d32b5 fixes css 2011-11-11 17:04:18 -03:00
gitlabhq 49b2fb24bc remove fluiod layout 2011-11-11 11:35:51 -05:00
gitlabhq c092f3972a fix view mode selection 2011-11-11 11:04:32 -05:00
gitlabhq 97cf5659aa fixed layout as default 2011-11-11 10:57:16 -05:00
gitlabhq 03b9369007 fixed link to issue from project dashboard 2011-11-11 10:45:44 -05:00
Nihad Abbasov f295ff84d9 create atom feed for issues 2011-11-11 13:29:58 +04:00
Dmitriy Zaporozhets 6f915d5a01 add fix code align 2011-11-11 10:28:06 +02:00
Nihad Abbasov 2b04c2a67f create atom feed for commits 2011-11-11 12:11:27 +04:00
Dmitriy Zaporozhets a5058229e4 restored .git-url, truncate project name for thumb 2011-11-11 09:36:01 +02:00
Dmitriy Zaporozhets 22bb925a40 Merge pull request #88 from iamntz/master 
small UI changes
 2011-11-10 23:28:57 -08:00
Staicu Ionut 594451563c - added notification for users with no ssh key 
- moved project urls into input fields to avoid text expanding out of the box (on very long url)
- removed extra markup for header menu arrow (:before ftw!)
- small style changes on url inputs
 2011-11-11 08:13:43 +02:00
Ricardo Rauch e5852d41cf code pre fix 2011-11-10 21:00:22 -03:00
Ricardo Rauch c0a30b3a0c Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-10 20:42:18 -03:00
Ricardo Rauch e2d0f42adf fixing buttons 2011-11-10 20:42:01 -03: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
Ricardo Rauch 99bd00158c fixing errors style 2011-11-10 19:42:34 -03:00
Ricardo Rauch 88466881b8 new layout for add project 2011-11-10 19:24:44 -03:00
Dmitriy Zaporozhets 60a9c051db removed br tag 2011-11-11 00:22:04 +02:00
Dmitriy Zaporozhets 4ecf17cf9a annotated 2011-11-11 00:08:20 +02:00
Ricardo Rauch 1155f2d1d2 fix css 2011-11-10 18:57:47 -03:00
Ricardo Rauch 56e449df50 fixing account box dropdown 2011-11-10 18:55:55 -03:00
Ricardo Rauch ff0dc87e3d fixes css 2011-11-10 18:15:47 -03:00
Saito f7756b8404 chmod -x style.scss 2011-11-10 16:24:11 +08:00
Dmitriy Zaporozhets 9a5f328313 notes should depends on user when destroy 2011-11-10 09:46:04 +02:00
Dmitriy Zaporozhets eb96336de1 1. Set Helvetica as primary font; 2. removed tabs 2011-11-09 21:26:24 +02:00
Ariejan de Vroom e608eacc4b Show commits as 'Commit' instead of 'Grit::Commit' 
Conflicts:

	app/helpers/dashboard_helper.rb
 2011-11-09 20:52:20 +02:00
Ariejan de Vroom 85468fb4ce Use secure.gravatar.com when running over SSL 2011-11-09 20:51:22 +02:00
Dmitriy Zaporozhets 8513526bfe Merge branch 'dev' 2011-11-09 20:31:52 +02:00
Nihad Abbasov 3f70316c5f fix elsif statement 2011-11-09 17:53:15 +04:00
gitlabhq b78f658143 dashboard beautify 2011-11-09 06:37:01 -05:00
Dmitriy Zaporozhets a44e329222 project dashboard updated 2011-11-09 01:56:10 +02:00
Aleksei Kvitinskii 1d85197b08 Merge branch 'issue-184' into dev 
Conflicts:
	app/views/layouts/project.html.haml
	app/views/projects/_form.html.haml
 2011-11-08 23:19:42 +02:00
Aleksei Kvitinskii 5b1634cd4b implemented cookie remember option for issue page filter 2011-11-08 23:02:57 +02:00
gitlabhq 49bced3a24 project form fixed 2011-11-08 12:23:13 -05:00
Aleksei Kvitinskii 1fa01cbcc9 fix typo 2011-11-08 00:02:50 +02:00
Dmitriy Zaporozhets 1c543bdfa8 restored sortable ability 2011-11-07 22:48:55 +02:00
Dmitriy Zaporozhets 32abaa33f8 Merge branch 'issues_restyle' into dev 2011-11-07 22:32:01 +02:00
Dmitriy Zaporozhets 67b9fa51dc fixed tests 2011-11-07 22:31:51 +02:00
Aleksei Kvitinskii 9e3915b259 fix typo in the template 2011-11-07 21:39:24 +02:00
Aleksei Kvitinskii 444b69ddc2 Merge branch 'dev' into issue-184 
Conflicts:
	app/views/layouts/project.html.haml
 2011-11-07 21:29:28 +02:00
Aleksei Kvitinskii 4a1b70f7b2 add tags to admin project form 2011-11-07 20:38:54 +02:00
Aleksei Kvitinskii 9054f64c53 correct padding in user, keys, password forms 2011-11-07 20:37:32 +02:00
Aleksei Kvitinskii eb5fa8344e correct padding in issue form and in profile form 2011-11-07 20:21:42 +02:00
Aleksei Kvitinskii af7bed2aa5 add tag links to project page 2011-11-07 19:48:58 +02:00
gitlabhq 60f083ad61 issues table header 2011-11-07 11:31:05 -05:00
gitlabhq c07d3dfc04 issue restyle example 2011-11-07 10:55:16 -05:00
Aleksei Kvitinskii 3fe9f3ebe6 implemented cookie remember option for issue page filter 2011-11-07 14:12:46 +02:00
Aleksei Kvitinskii 060a2e2257 move tag path to the appropriate helper 2011-11-07 13:40:22 +02:00
Dmitriy Zaporozhets 06e916743e lil css style 2011-11-07 00:24:09 +02:00
Dmitriy Zaporozhets 7ac38b7a1e fixed duplicate on wall 2011-11-06 23:32:37 +02:00
Dmitriy Zaporozhets 63c2c2cc23 Merge branch 'dev' 2011-11-06 22:53:54 +02:00
Dmitriy Zaporozhets e29a25662d fixed 1click repo url selection 2011-11-06 22:53:36 +02:00
Dmitriy Zaporozhets b4868a8972 Improved commit author detection 2011-11-06 22:38:08 +02:00
Dmitriy Zaporozhets f87f0201f0 link to author on tree view item 2011-11-06 22:21:48 +02:00
Aleksei Kvitinskii 1d1b5186c3 fix small bug in top menu (buttons change height on press in chrome) 2011-11-06 21:43:34 +02:00
Aleksei Kvitinskii 526752479d correct html on project page 2011-11-06 20:48:57 +02:00
Aleksei Kvitinskii 81847a9335 Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev 2011-11-06 19:21:51 +02:00
Dmitriy Zaporozhets 671e261e90 lil design changes 2011-11-06 15:52:23 +02:00
Aleksei Kvitinskii 072b2d5de8 Implement tags cloud support for projects 2011-11-05 22:22:26 +02:00
Aleksei Kvitinskii 62112dc0c7 add tags to project list 2011-11-05 22:16:13 +02:00
Aleksei Kvitinskii 6e08b5cc85 create tags page and made tag filter for projects 2011-11-05 21:00:05 +02:00
Dmitriy Zaporozhets 0499759204 issues & fixed layout 2011-11-05 15:31:54 +02:00
Aleksei Kvitinskii 1e5aa0efff add tags autocomplete 2011-11-05 14:57:40 +02:00
Dmitriy Zaporozhets 31a9d6531d commits notes under diff. tab removed 2011-11-05 14:45:52 +02:00
Dmitriy Zaporozhets 5eecbfdb10 commit paging fixes 2011-11-05 14:26:06 +02:00
Dmitriy Zaporozhets 586c53ea05 fixed notes loading/paging 2011-11-05 13:59:43 +02:00
Aleksei Kvitinskii 6323cdda68 Merge branch 'dev' into issue-184 2011-11-05 08:15:31 +02:00
gitlabhq 0b0e0225ad css fixes 2011-11-04 12:20:52 -04:00
gitlabhq 2ed5211dad fixes 2011-11-04 11:59:00 -04:00
gitlabhq 8a23682fc5 refactored too 2011-11-04 11:46:51 -04:00
gitlabhq ca1e3d0579 wall login in progress 2011-11-04 09:37:38 -04:00
Aleksei Kvitinskii b946da4469 added tags to form 2011-11-04 10:11:14 +02:00
Dmitriy Zaporozhets 687290a00d fixed brach switch 2011-11-04 09:46:58 +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
Dmitriy Zaporozhets 287c3c167b Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev 2011-11-04 00:37:47 +02:00
Dmitriy Zaporozhets a9639776d7 fixed/fluid layout switch 2011-11-04 00:37:02 +02:00
gitlabhq 3ba392b3cb new ref switch 2011-11-03 12:28:33 -04:00
gitlabhq 5f900772c2 new favicon 2011-11-03 10:36:02 -04:00
gitlabhq a767a86ce8 Merge branch 'dev' 2011-11-03 10:18:32 -04: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 83c1194d52 Merge branch 'dev' into user_dashboard 2011-11-02 20:59:06 +02:00
gitlabhq 5fb1b9ffe3 view refactoring 2011-11-02 11:21:17 -04:00
gitlabhq a6fa80529a body class 2011-11-02 00:19:29 +02:00
gitlabhq e9b22a2def Merge branch 'dev' into user_dashboard 
Conflicts:
	app/views/layouts/_head_panel.html.erb
 2011-11-01 22:56:58 +02:00
gitlabhq 5e12f10c14 fixes 2011-11-01 22:51:20 +02:00
gitlabhq 82d16ccfd1 commits + tree in progress 2011-11-01 22:11:24 +02:00
gitlabhq babd0557cb Merge branch 'dev' into new_layout 
Conflicts:
	app/assets/stylesheets/projects.css.scss
 2011-11-01 20:29:46 +02:00
gitlabhq e8d10b3217 issues fix layout 2011-11-01 13:17:36 +02:00
gitlabhq 84397ce88c commits page 2011-11-01 12:48:26 +02:00
gitlabhq 0903932320 updated 2011-11-01 11:22:16 +02:00
gitlabhq d405292388 project page fixed 2011-11-01 11:00:59 +02:00
gitlabhq 485c5199b7 user dashboard 2011-10-31 22:57:16 +02:00
Nihad Abbasov 267bd6068c Merge branch 'issue-101' into dev 2011-10-31 23:37:09 +04:00
Nihad Abbasov 11b70c97e3 fix issue notification properly 2011-10-31 23:21:28 +04:00
Nihad Abbasov 3e95a6d73b make commit messages multiline 2011-10-31 17:34:22 +04:00
Nihad Abbasov 43c1039957 don't send notification to issue creator 2011-10-31 16:49:38 +04:00
gitlabhq 9bf39477de commit 2011-10-31 13:30:53 +03:00
gitlabhq fb33ccd87f Merge branch 'dev' into new_layout 2011-10-31 13:11:46 +03:00
gitlabhq 3becd06423 icons & css 2011-10-31 13:11:22 +03:00
Nihad Abbasov ded7d08d70 Merge branch 'refs/heads/markdown_notes' into dev 2011-10-31 13:49:33 +04:00
Nihad Abbasov 31280cd4cb fix markdown truncation on dashboard 2011-10-31 13:47:10 +04:00
Nihad Abbasov 406076731e Merge branch 'refs/heads/markdown_notes' into dev 2011-10-30 19:49:09 +04:00
Nihad Abbasov 1f3323f908 use helper to markdown text 2011-10-30 17:41:57 +04:00
gitlabhq 0dc5364aec reset pwd 2011-10-28 18:29:52 +03:00
gitlabhq 5d879a0643 signin page 2011-10-28 18:25:00 +03:00
gitlabhq 487ae906a9 project layout 2011-10-28 15:07:58 +03:00
gitlabhq 1ffb4b98c0 new design/layout started. projects page 2011-10-28 14:41:39 +03:00
gitlabhq ae47d69281 Merge branch 'dev' 2011-10-28 12:33:07 +03:00
gitlabhq 3fa770dd10 Merge branch 'new_issue' into dev 2011-10-28 12:26:25 +03:00
gitlabhq a017181339 new issue format 2011-10-28 12:22:09 +03:00
VSizov fb40d27d1e remove spaces 2011-10-28 11:34:30 +03:00
Nihad Abbasov 6c7706eb17 process notes w/ rdiscount 2011-10-28 00:57:10 +05: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 2258db66c2 issue can be edit from show page 2011-10-27 18:18:50 +03:00
gitlabhq 9611a27e0c note as text 2011-10-27 17:33:20 +03:00
gitlabhq 5fe736ab28 little fix 2011-10-27 17:08:40 +03:00
gitlabhq e41bc4dd50 #173 2011-10-27 16:50:35 +03:00
DZ 84457708d8 Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev 2011-10-27 16:47:39 +03:00
gitlabhq d64f23e294 code cleaning 2011-10-27 16:44:29 +03:00
Nihad Abbasov 00613d0d50 Merge branch 'refs/heads/assets-refactoring' into dev 2011-10-27 14:51:05 +05:00
Nihad Abbasov be364d1004 move jquery ui images to vendor directory 2011-10-27 14:47:56 +05:00
Nihad Abbasov 2801589c41 remove jquery ui css from application layout. it's already included in assets 2011-10-27 14:47:06 +05: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 5e584ee626 refactor lifetime_select helper 2011-10-27 12:11:42 +05:00
Nihad Abbasov 8e1e17763f implement snippets lifetime 2011-10-27 11:46:21 +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 e0f4a37f3d update project's dashboard every 5 minutes 2011-10-26 23:22:42 +05:00
Nihad Abbasov f1e25f2563 move lib assets to vendor directory 2011-10-26 22:42:24 +05:00
Nihad Abbasov 3228b62755 fix repo url selecting on click 2011-10-26 22:17:46 +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 1beb84161c search field style 2011-10-26 07:44:02 +03:00
gitlabhq fb01f45890 issue search styleup 2011-10-26 07:34:02 +03:00
Adam Leonard 92f6de0370 If terms are removed show all results for current status 2011-10-25 20:15:11 -04: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 f6a67fbad5 Issue #87 2011-10-25 21:04:31 +03:00
gitlabhq 9afee5ad52 Add critical status to issues 2011-10-25 07:34:02 +03:00
gitlabhq afe98ae74a Issue #149 fixed 2011-10-25 07:32:02 +03:00
gitlabhq 5baa5fad0a Issue #149 2011-10-24 22:38:03 +03:00
Sairam Kunala 61e6751ea6 bug fix: history in commit history not working as expected for tags and branches 2011-10-23 15:10:33 +05:30
gitlabhq 00290b9214 test cov 2011-10-22 14:08:03 +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 29e11d1461 link to file for commit diff 2011-10-22 14:08:03 +03:00
gitlabhq 9fa4df16ec now you can view comrade profile info #134 2011-10-22 14:08:03 +03:00
gitlabhq b3279b9b51 moved from albino -> pygments.rb 2011-10-22 14:08:03 +03:00
gitlabhq d49645a013 fixed wall --all option 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
Adam Leonard 5b284f6adf Add ability to Search issues 2011-10-22 00:06:38 -04:00
Aleksei Kvitinskii dde2879589 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-10-21 16:00:27 +03:00
Aleksei Kvitinskii cee932500c now you can view comrade profile info #134 2011-10-21 15:56:37 +03:00
gitlabhq 1477a6c8aa moved from albino -> pygments.rb 2011-10-21 15:35:42 +03:00
gitlabhq f280819189 fixed wall --all option 2011-10-21 14:25:42 +03:00
gitlabhq a07923a549 recent radio button 2011-10-21 14:03:34 +03:00
gitlabhq c463eeb090 refactoring 2011-10-20 22:00:00 +03:00
gitlabhq 48924dfeea Wall redesign 2011-10-20 19:21:58 +03:00
Aleksei Kvitinskii 59704f481e extended user profile with social fields 2011-10-20 01:34:05 +03:00
gitlabhq 9ad444f02e dashboard updated, links from project to dasdhboard 2011-10-19 20:41:14 +03:00
gitlabhq 69e0ea6265 dashboard 2011-10-19 16:25:32 +03:00
Zevs 85265b1bac #40 max key length 2011-10-18 23:22:04 +03:00
gitlabhq f8b5e5f78e dashboard 2011-10-18 17:57:01 +03:00
gitlabhq 1a03b17ab5 dsaboard 2011-10-18 17:44:43 +03:00
gitlabhq dbd69d1d0e dashboard lite version 2011-10-18 15:02:05 +03:00
gitlabhq b0f216ba17 fix sort 2011-10-18 14:55:51 +03:00
gitlabhq fc177a30f7 commit time sort 2011-10-18 14:38:57 +03:00
gitlabhq f8e1766714 lost file 2011-10-18 14:34:48 +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 2daa6161fd prevent double note submit 2011-10-17 20:05:47 +03:00
gitlabhq 74a89d9ed6 ajax notes load 2011-10-17 19:48:10 +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 8c88924606 fix #132 2011-10-17 01:14:48 +03:00
gitlabhq bcf55312f7 fixed #132 2011-10-17 00:30:48 +03:00
gitlabhq 9265de3d25 snippets are ready 2011-10-17 00:07:10 +03:00
gitlabhq 526ad466c8 fix issue sorting 2011-10-15 21:08:38 +03:00
gitlabhq 99777cab2a Merge branch 'issue_im' 
Conflicts:
	config/initializers/rails_footnotes.rb
 2011-10-15 20:54:39 +03:00
VSizov e6bba9be4f icon for handler of sortable 2011-10-15 20:41:38 +03:00
gitlabhq c37492b5dc profile in header 2011-10-15 20:37:42 +03:00
VSizov df016465cd ability for sortable 2011-10-15 20:13:51 +03:00
VSizov dd833d28ad Sortable issues 2011-10-15 19:56:53 +03:00
gitlabhq 876ebbd9ad issue #89 2011-10-15 19:46:27 +03:00
gitlabhq 57baa49bc3 project path & code regexp validation 2011-10-15 19:30:56 +03:00
gitlabhq 29158ea38c Issue #123 2011-10-15 18:57:27 +03:00
gitlabhq a9d224d36d issue #124 2011-10-15 18:51:58 +03:00
gitlabhq 3208b6747d links for admin 2011-10-15 00:12:02 +03:00
gitlabhq 53421e060a clean controllers 2011-10-15 00:05:41 +03:00
gitlabhq 5f8255ac67 Fixed: invalid browse code for commit. Perfomance test added 2011-10-14 22:43:25 +03:00
gitlabhq 153f6cd86b refactoring + remove unnecessary feature 2011-10-14 19:30:31 +03:00
gitlabhq 2d577cae9d branch/tag remember - to session instead of cookie 2011-10-14 18:33:05 +03:00
gitlabhq fc34fc86c6 branch/tag memorization 2011-10-14 18:08:25 +03:00
gitlabhq da0b50f8ec fix fuckin merge 2011-10-14 16:42:10 +03:00
gitlabhq 2cd52b492a install & update 2011-10-14 16:40:41 +03:00
gitlabhq a18924e954 issue #103 2011-10-14 15:22:07 +03:00
gitlabhq 0f6ebcb694 v1.0 2011-10-13 04:00:00 +03:00
gitlabhq eefe826f83 project tile view 2011-10-12 16:19:14 +03:00
gitlabhq ea4ded6e54 css fix 2011-10-10 00:23:33 +03:00
gitlabhq ec9e54ea94 gitosis error handle 2011-10-10 00:15:28 +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