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

1307 commits

Author SHA1 Message Date
Dmitriy Zaporozhets ac7bb20682 fixed app crash on new issue via get 2012-04-17 20:35:27 +03:00
Dmitriy Zaporozhets 3250a024ef 1. Improved admin -> new project form 
2. Fixed bug: post-receive file was not added when create project via admin
 2012-04-17 20:27:18 +03:00
Dmitriy Zaporozhets f1795a4911 Issues form improved, Show milestone for Issue show 2012-04-17 00:22:59 +03:00
Dmitriy Zaporozhets c9def945d4 User blocking improved. Admin area styled 2012-04-16 23:33:03 +03:00
Valery Sizov a8e4f3ed88 Auto-merge: 'already can not be merged' alert 2012-04-16 23:05:08 +03:00
Valery Sizov 8269a3a735 Auto-merge: checking via AJAX 2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets c0df0cd70c Commit header improved. finalize PR 667 2012-04-16 01:10:09 +03:00
Dmitriy Zaporozhets a7ed8276d7 Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers 2012-04-15 21:01:35 +03:00
Arthur Schreiber ad25dac8b6 Change the design a bit to look more like before. 2012-04-14 12:38:12 +02:00
Arthur Schreiber d9ba277ee1 Make parent sha links nicer for merge commits. 2012-04-14 12:38:12 +02:00
Arthur Schreiber c530543c1a Nicer commit headers. 2012-04-14 12:38:12 +02:00
Dmitriy Zaporozhets 95fde9bd7a Projects page as dashboard. Old dashboard removed 2012-04-14 11:20:45 +03:00
Dmitriy Zaporozhets 5f31989a05 Search improved 2012-04-14 11:16:11 +03:00
randx 497ee5fbbc Ability to block user 2012-04-13 08:12:34 +03:00
Dmitriy Zaporozhets fb6d4511a0 restored dark theme 2012-04-12 00:54:07 +03:00
Dmitriy Zaporozhets 0e62b1cbaa preserve for code browse 2012-04-11 23:59:53 +03:00
Dmitriy Zaporozhets 088860de4e feed few fixes 2012-04-11 23:50:13 +03:00
Dmitriy Zaporozhets 740e54c3fc Merge pull request #667 from keikubo/master 
The indents errors of pre blocks in haml
 2012-04-11 13:34:15 -07:00
Dmitriy Zaporozhets e7add858cf bug fixes & bootstrap buttons 2012-04-11 23:32:45 +03:00
Dmitriy Zaporozhets b7558a2063 Removed encoding monkey patch 2012-04-11 23:03:56 +03:00
Kei Kubo 42f04bf70c bug fix: broken indents fixed in markdown rendered statements 2012-04-11 19:36:52 +00:00
Kei Kubo 700eec6672 added = preserve to some pre statements 2012-04-11 19:13:38 +00:00
Kei Kubo 51ca0abf10 bug fix: <pre> indent error fixed in projects/empty.html 2012-04-11 10:35:49 -07:00
Dmitriy Zaporozhets 52f6df7255 b2 ipad fixed 2012-04-10 21:53:30 +03:00
Dmitriy Zaporozhets ba3c359fd5 b2 fixes 2012-04-10 21:39:04 +03:00
Dmitriy Zaporozhets 8f22834c4e bootstrap 2 integration complete. 2012-04-10 20:50:27 +03:00
Dmitriy Zaporozhets 2587de74df Minor fixes 2012-04-10 20:06:17 +03:00
randx 627efddf63 migrated to bootstrap 2 2012-04-10 08:51:08 +03:00
Dmitriy Zaporozhets d98b183361 first pack of tests for milestones 2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets 23d950855d Milestone basic scaffold 2012-04-09 00:28:58 +03:00
Dmitriy Zaporozhets 667edcdd75 Dashboard issues/mr pages improved 2012-04-08 00:18:32 +03:00
Dmitriy Zaporozhets 88974b500f projects list on dashboard with commit links 2012-04-07 23:13:18 +03:00
Dmitriy Zaporozhets 2fa4aadb8f fixed tree hover 2012-04-07 17:30:00 +03:00
Dmitriy Zaporozhets 8fa22de9ac Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-07 01:08:42 +03:00
Andrea Dal Ponte f30d56494e admin_user_path correction 2012-04-06 12:00:13 +02:00
randx 1a3ce182ea tree view pollished 2012-04-06 08:48:58 +03:00
Dmitriy Zaporozhets 7909fba592 increased image preview size 2012-04-06 01:30:52 +03:00
Dmitriy Zaporozhets 86676476e6 Handling big commits & big diff 2012-04-06 01:00:15 +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
randx 897da534fa Fix issues with push 600+ commits. refactored, improved push events 2012-04-04 07:39:04 +03:00
randx eb2c1cd2e3 rollback to yaml 2012-04-04 02:59:58 +03:00
randx 911ce0d3e5 reverted event data 2012-04-04 02:59:58 +03:00
randx 82c8c42aee Move all serialization to marshall 2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets 11e4709fde fix compatibility with old events 2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets a951e6f8ae GitlabSerialize: cause of invalid yaml in some events we migrate to json serialization 2012-04-04 02:25:33 +03:00
Dmitriy Zaporozhets 8aa5076d68 pollished team index 2012-04-04 01:21:31 +03:00
Denis Novikov 8abaf05aa9 Force diff line to UTF-8 encoding - proper fix. 2012-04-03 18:43:07 +02:00
Dmitriy Zaporozhets c40c627a3b team profile restyled 2012-04-02 21:13:44 +03:00
Dmitriy Zaporozhets a264ef2f03 fixed tree view compass 2012-04-02 20:29:39 +03:00
Dmitriy Zaporozhets c9db6bb3f2 prevent app crash for events without git resources 2012-04-02 19:51:20 +03:00
Dmitriy Zaporozhets 00dc34e192 Events improved & refactored. Dashboard pollished 2012-04-02 00:24:45 +03:00
Dmitriy Zaporozhets 6ed5d9bc11 dashboard/projects page project selection ui improved 2012-04-01 00:23:34 +03:00
Dmitriy Zaporozhets 1ed831846d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-31 15:59:42 +03:00
Dmitriy Zaporozhets 25924a9089 Email link https support 2012-03-31 15:59:06 +03:00
Dmitriy Zaporozhets f145450415 fixed mr unmergable method 2012-03-31 13:48:30 +03:00
Dmitriy Zaporozhets 90748cf724 Merge Button v1 complete 2012-03-30 20:49:34 +03:00
Staicu Ionut 2b01c65e50 - when you add a new ssh key, the title field automatically fills with the email (if is present in the key sting) 2012-03-30 18:30:56 +03:00
randx 3824f9b372 Unverify MR on every push. Ajax for MR accept. better UI 2012-03-30 08:15:04 +03:00
randx 411d84f385 Better merge handling. show if MR can be accepted or not 2012-03-30 08:05:04 +03:00
Dmitriy Zaporozhets cd74f9da91 Link for auto merge, db field for MR 2012-03-30 00:27:42 +03:00
randx 78d620b3b6 Raw gitlab automerge feature 2012-03-29 18:03:05 +03:00
Dmitriy Zaporozhets 8ee0993fdf Event & Wiki models specs 2012-03-28 22:53:45 +03:00
randx 69ef81404c UI improved, .main_box css class for show pages 2012-03-28 10:46:51 +03:00
randx 88d9569a33 Project model refactored. Modularity gem 2012-03-28 10:44:51 +03:00
Dmitriy Zaporozhets bae4efa7cf Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-03-28 00:31:22 +03:00
Dmitriy Zaporozhets 46906ca9db Issues, Merge Request show page polished. Fixed +n overflow 2012-03-28 00:31:14 +03:00
Valeriy Sizov 341b6d546b Merge pull request #586 from patthoyts/pt/ldap-auth-fix 
Ensure LDAP provided email is always compared case-insensitively.
 2012-03-27 13:09:06 -07:00
Valery Sizov 1bb804da7f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-27 23:04:45 +03:00
Valery Sizov 442d5dbef2 fixed yellow background in markdown documents 2012-03-27 23:04:21 +03:00
Dmitriy Zaporozhets 1647f46b1f Project show page polished 2012-03-26 23:11:15 +03:00
Dmitriy Zaporozhets 788de6f1c8 Better commit show page 2012-03-26 22:41:56 +03:00
Dmitriy Zaporozhets 7d56a51bdc Js refactoring and ajax animation replaced 2012-03-26 21:41:58 +03:00
Dmitriy Zaporozhets f1c534c68e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-26 20:30:06 +03:00
Gosha Arinich 73404f6281 there should be no space after '(' and before ')' 2012-03-26 12:11:02 +03:00
randx dfe9f3674c fix image width for markdown 2012-03-26 07:40:51 +03:00
Dmitriy Zaporozhets 39ea486e1f Fixed specs. Some css fixes 2012-03-25 19:44:29 +03:00
Dmitriy Zaporozhets 8652cd8989 Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit. 2012-03-25 19:05:24 +03:00
Steven Verbeek 3c9a18a0bf Forgot others for border radius 2012-03-24 18:31:01 -03:00
Steven Verbeek 54dc2d5c32 Changed Note to Comment 2012-03-24 18:19:26 -03:00
Steven Verbeek d3cb694edb Fixed icon, added helper 2012-03-24 14:42:45 -03:00
Steven Verbeek c359db3852 Removed thumbs.db 2012-03-24 14:38:10 -03:00
Steven Verbeek a805d3131f Fixed line ending issues on windows. 2012-03-24 14:36:14 -03:00
Steven Verbeek 27244e0c9e Fixed line ending issues on windows. 2012-03-24 14:01:38 -03:00
Steven Verbeek c2c4424ff8 Started note attachment changes, and text changes 2012-03-24 13:57:01 -03:00
Steven Verbeek 597afb7ce2 Started note attachment changes, and text changes 2012-03-24 13:53:16 -03:00
Steven Verbeek e5fa0bb127 Started note attachment changes, and text changes 2012-03-24 13:40:21 -03:00
Steven Verbeek fb4c033aeb Started note attachment changes, and text changes 2012-03-24 13:30:04 -03:00
Steven Verbeek b91128cc6a Started note attachment changes, and text changes 2012-03-24 13:26:25 -03:00
Steven Verbeek 194467b8f8 Started note attachment changes, and text changes 2012-03-24 13:19:20 -03:00
Steven Verbeek 46605c9175 Started note attachment changes, and text changes 2012-03-24 13:08:42 -03:00
Steven Verbeek 6c40e89853 merging upstream changes 2012-03-24 00:36:54 -03:00
Dmitriy Zaporozhets 1c6df8e075 Improved profile & team member show 2012-03-24 01:01:36 +02:00
Pat Thoyts b9b65b8d4e Ensure LDAP provided email is always compared case-insensitively. 
LDAP databases may store email addresses in mixed case so
ensure we only work with a lower case version to avoid missing
a valid account after LDAP login.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-03-23 14:59:54 +00:00
Dmitriy Zaporozhets fa8219e0a7 better MR list, dashboard pollished 2012-03-22 22:57:04 +02:00
Dmitriy Zaporozhets 81da8e46f2 Remove button for empty repo. Last push on dashboard. Better notes count indicator for issues 2012-03-22 22:28:02 +02:00
Dmitriy Zaporozhets 6f2c193204 Fix issues search 2012-03-22 20:09:47 +02:00
Dmitriy Zaporozhets e241d1e670 Fix form label for ssl requests 2012-03-22 20:02:38 +02:00
randx 52d8ed9e4f Pagination for Merge Requests. Fixed for issues 2012-03-22 00:09:57 +02:00
randx 755a894c91 Issues pagination 2012-03-22 00:09:56 +02:00
Valery Sizov 039b6db483 design improve of form of key 2012-03-22 00:09:53 +02:00
Valery Sizov 8bb4c6de56 improve how to merge tips 2012-03-21 23:59:12 +02:00
Steven Verbeek fafc34b0db merging upstream changes 2012-03-21 00:21:34 -03:00
Dmitriy Zaporozhets b57faf9282 Push events polished 2012-03-20 23:59:35 +02:00
Steven Verbeek 35d0de8f36 merging upstream changes 2012-03-19 21:57:29 -03:00
Steven Verbeek 2a7cd2f1b5 Fixed tab indent. 2012-03-19 21:43:25 -03:00
Steven Verbeek 550274e136 Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments 2012-03-19 21:32:08 -03:00
Dmitriy Zaporozhets cadf12c60c Merged activities & projects pages 2012-03-20 00:05:35 +02:00
Dmitriy Zaporozhets 724ea16c34 Activities page added. Dashboard few specs. Preparing for 2.3 2012-03-19 22:52:16 +02:00
Steven Verbeek c43ac3c721 Small fix. 2012-03-17 13:13:42 -03:00
Steven Verbeek 66d64ad4f4 Fixed code in issue details, changed form description to details. 2012-03-17 13:02:48 -03:00
Steven Verbeek 2228f1b1ad Fix for readme code being yellow in code blocks (left it yellow outside code blocks) 2012-03-17 12:49:23 -03:00
Steven Verbeek 9cbd1aef20 Fixed row messed up. Started on overall look. 2012-03-17 03:31:38 -03:00
Steven Verbeek aeed7da6d4 Fixed HR 2012-03-17 02:48:22 -03:00
Steven Verbeek 1c2c860c22 Fixed css issues with issues :) 2012-03-17 02:46:47 -03:00
Steven Verbeek c93fda2737 Added markdown is enabled. 2012-03-17 02:24:51 -03:00
Steven Verbeek 1b96985025 Re-added back to issues list, but moved it above title. Added css to move issue meta data around. 2012-03-17 02:22:12 -03:00
Steven Verbeek 7712d81f9b Moved OPEN and removed back link (you can easily click on issues to get to the same spot) 2012-03-17 02:17:04 -03:00
Steven Verbeek 3263f2e1ab Fixed markdown. 2012-03-17 02:13:36 -03:00
Steven Verbeek 4dc1331676 Markdown for issue description, added issue title 2012-03-17 02:09:16 -03:00
Steven Verbeek 94fd9a6e47 Added issue description. 2012-03-17 00:24:40 -03:00
Steven Verbeek 8a9e90dac5 Changed some more wording 2012-03-16 23:48:29 -03:00
Steven Verbeek b6fdb8557b Changed title to issue message (name) and changed Save to Submit new issue. 2012-03-16 23:43:28 -03:00
Steven Verbeek f59ec80412 Fix for search input when focused, no longer turns blue. 2012-03-16 22:40:36 -03:00
Dmitriy Zaporozhets 341b4414ea styled title block for mr, issue, commit 2012-03-16 21:11:03 +03:00
Dmitriy Zaporozhets 2ec12c9bb8 Impoved merge requests show page. Minor style improvements across project 2012-03-16 01:45:46 +02:00
Dmitriy Zaporozhets 7f76d6cfee counters for dashboard panel 2012-03-16 01:31:46 +02:00
Dmitriy Zaporozhets 5d2bd5ec3a Simple search implementation 2012-03-16 01:14:39 +02:00
Dmitriy Zaporozhets b2c13bdd77 button styled 2012-03-15 23:44:04 +02:00
Dmitriy Zaporozhets 7b75f3cfd3 show who merged request 2012-03-15 23:32:00 +02:00
Dmitriy Zaporozhets 828f84fdb3 fixed merge request notes hide 2012-03-15 23:01:50 +02:00
Dmitriy Zaporozhets 2e2e0522d4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-15 19:39:28 +02:00
Ariejan de Vroom cbc56a96ac Updated upvotes view for issue and merge request show 2012-03-15 13:03:56 +02:00
Dmitriy Zaporozhets 5a3f23f395 Persist Merge Request diff. Auto merge request close on push 2012-03-15 00:57:43 +02:00
Ariejan de Vroom 27e3699814 Links +upvote buttons directly to the notes section 2012-03-15 00:56:42 +02:00
Ariejan de Vroom 2d00f2dfe4 Added 'x notes' and +1 counters to issues and merge requests. Refs #549 2012-03-15 00:51:03 +02:00
Ariejan de Vroom 8d8b82127f Count +1 votes in issue notes. 2012-03-14 15:31:31 +02:00
Ariejan de Vroom ed11ca13e8 Added form hint about markdown for the project description 2012-03-14 12:39:33 +02:00
Ariejan de Vroom 317963b1ab Use markdown to render the project description. 2012-03-14 12:34:03 +02:00
Dmitriy Zaporozhets 3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets 781f5aa6fb classic theme improved, images refactored 2012-03-13 22:17:13 +02:00
Dmitriy Zaporozhets e44ee826ac tree browse -> file icons 2012-03-12 23:52:10 +02:00
Loïc Gerbaud 3ae93e6f97 Typo : "vist" -> "visit" on dashboard 2012-03-12 13:15:48 +01:00
Andrey Janzen 34ea7fdb36 fix typo 2012-03-12 09:02:05 +07:00
Dmitriy Zaporozhets af0b65ddb8 projects page improved 2012-03-11 11:46:15 +02:00
Dmitriy Zaporozhets 4d24c3bb21 fixed snippet show 2012-03-10 23:57:53 +02:00
Dmitriy Zaporozhets a10ad7183e Usability improved. Nothing to show messages for issues, MR 2012-03-10 23:41:05 +02:00
Dmitriy Zaporozhets bd7359b50e fix text color for account popup hover 2012-03-10 22:59:14 +02:00
Dmitriy Zaporozhets 620e83d01a fixed line height for top panel 2012-03-10 11:32:43 +02:00
Dmitriy Zaporozhets 5e1b9360b4 main menu css updated 2012-03-10 00:47:59 +02:00
Dmitriy Zaporozhets cd06d6edac Project model refactored 2012-03-09 21:43:46 +02:00
Dmitriy Zaporozhets 51f7d94991 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-09 20:05:07 +02:00
Dmitriy Zaporozhets fc058605c2 fixed app crash if edit empty project from admin 2012-03-09 20:04:26 +02:00
Dmitriy Zaporozhets 3c3d26f3e7 Merge pull request #529 from abhid/branch-commit-url-fix 
This might fix the issue with commits showing up in the format.
 2012-03-08 02:08:25 -08:00
Dmitriy Zaporozhets d4ebde9378 help updated 2012-03-08 00:15:31 +02:00
Dmitriy Zaporozhets a9ef0bc343 test fix, css refactoring 2012-03-07 23:55:46 +02:00
Abhi Devireddy 32f04fc345 This might fix the issue with commits showing up in the format. 
Needs to be tested.
 2012-03-07 11:41:39 -06:00
Dmitriy Zaporozhets c9b64974c0 increased dashboard width 2012-03-07 00:16:43 -08:00
Dmitriy Zaporozhets 57ce7124fc Fixed invalid commit show if git history broken 2012-03-07 00:15:43 -08:00
Dmitriy Zaporozhets 94befdd502 Events improved. Open/close issue, merge request events displayed 2012-03-07 00:13:43 -08:00
Dmitriy Zaporozhets 98b484b996 Merge pull request #520 from abhid/default-ssh-username 
Removed hardcoded SSH Username on project create/edit form. Fixes Issue #493
 2012-03-07 00:12: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
Abhi Devireddy a7c8ce6a4d Removed hardcoded SSH Username on project create/edit form 2012-03-06 17:39:07 -06:00
Dmitriy Zaporozhets eb7bbedb20 Polishin & fixed tree switch 2012-03-06 00:29:40 +02:00
Dmitriy Zaporozhets cb59aade4e Cleaning and refactoring 2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets 74f8bc7298 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-06 00:16:40 +02:00
Uwe Kleinmann eac366a97b Sets correct content type on web hook execution. 2012-03-05 02:38:18 +01:00
Dmitriy Zaporozhets 0727edd8a0 Removed issues,mr delete buttons. Refactored models 2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets 3fe9d2972f 2.3.0 pre 2012-03-04 12:35:15 +02:00
Dmitriy Zaporozhets bc6915f24a projects page finished 2012-03-04 03:00:19 +02:00
Dmitriy Zaporozhets d6b051c5be get rid of sidebar 2012-03-03 13:03:03 +02:00
Dmitriy Zaporozhets 62707bb730 fixed invalid issues link on dashboard 2012-03-03 11:23:03 +02:00
Dmitriy Zaporozhets 6de7dc1e67 New projects page 2012-03-03 00:09:17 +02:00
Dmitriy Zaporozhets 9f1a5f415a Key uniq method refactored 2012-03-02 22:44:30 +02:00
Dmitriy Zaporozhets 2d162ff9ac Fix for mysql database cause key is a reserved word 2012-03-02 22:33:29 +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 00028702fc design tab improved. Themes added 2012-03-01 21:23:50 +02:00
Dmitriy Zaporozhets 375ebcabfd improved activity ui 2012-03-01 20:47:57 +02:00
Dmitriy Zaporozhets c94159ab08 improved dashboard 2012-03-01 20:40:32 +02:00
Ariejan de Vroom b0ce61c4f2 Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique 
Added/fixed specs
Update spec/factory to allow Factory#new without opts

Conflicts:
	app/models/key.rb
 2012-03-01 16:00:14 +01:00
Ariejan de Vroom df6f748179 Merge pull request #459 from patthoyts/pt/gravatar-fix 
Generate consistent gravatar hash values as per documentation.
 2012-03-01 06:03:48 -08:00
Dmitriy Zaporozhets 1924de91c5 fixed compare for push 2012-02-29 23:34:06 +02:00
Dmitriy Zaporozhets f6f939eeb8 UI mars theme updated. search field improved 2012-02-29 23:21:23 +02:00
Dmitriy Zaporozhets 25bde28d13 Fixed tests. removed delegate to id 2012-02-29 23:04:09 +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 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 85954621a3 new UI theme - mars 2012-02-29 00:45:38 +02:00
Dmitriy Zaporozhets 93a5b3d811 Merge pull request #485 from deanperry/master 
Fixed spelling mistake - 'yo tour' to 'to your'
 2012-02-28 13:12:08 -08:00
Dmitriy Zaporozhets a1385d11ac hide admin link for users 2012-02-28 23:08:11 +02:00
Dmitriy Zaporozhets 5c2e89b279 reduced number of recent projects for dashboard to 5 2012-02-28 23:01:50 +02:00
Dmitriy Zaporozhets 376bec26de Added dashboard page. Projects page not root from now 2012-02-28 22:59:36 +02:00
Dean Perry b9e23b906e fixed spelling mistake - 'Ream more' to 'read more' 2012-02-28 19:35:35 +00:00
Dean Perry c9c292f350 fixed spelling mistake - 'yo tour' to 'to your' 2012-02-28 19:31:27 +00:00
Dmitriy Zaporozhets 34e1580184 Improved file browse page, prepared for downloads tab 2012-02-28 00:00:19 +02:00
Dmitriy Zaporozhets bcf03b5de6 tree css fixes 2012-02-27 20:51:12 +02:00
Dmitriy Zaporozhets 8716fc78f3 Added loading animation for notes 2012-02-27 20:44:13 +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 f0f14c8eab finished scss refactoring 2012-02-27 00:41:53 +02:00
Dmitriy Zaporozhets 3a4b4fb4cd Moving ui styles to one scss file, Added ui class to body 2012-02-27 00:21:53 +02:00
Dmitriy Zaporozhets 065c200c33 removed unnecessary hr tags & titles 2012-02-26 22:06:40 +02:00
Dmitriy Zaporozhets 1e8b111be8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-02-26 21:39:13 +02:00
Dmitriy Zaporozhets f403da73f5 Fixed ajax loading image. Fixed wrong wording 2012-02-26 21:38:45 +02:00
Dmitriy Zaporozhets e6ea73c776 Merge pull request #468 from bencevans/patch-1 
Title for a link fixed
 2012-02-25 13:12:49 -08:00
bgondy 0347fe2412 Update app/views/projects/team.html.haml 2012-02-25 16:41:58 +01:00
Ben Evans 2b5c61bdec Title for a link fixed 2012-02-25 11:03:44 +00:00
Dmitriy Zaporozhets 460eeb13b7 Increased count of notes loaded when visit wall page 2012-02-24 22:48:27 +02:00
Dmitriy Zaporozhets 21c141afb1 Merge branch 'notes_refactoring' 2012-02-24 22:39:51 +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
Christos Trochalakis e42fb4fda4 Fix broken commit link in branches page 2012-02-24 17:27:44 +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
Pat Thoyts 2be4fe2858 Generate consistent gravatar hash values as per documentation. 
The gravatar documentation on implementing the hash specifies that leading
and trailing whitespace must be trimmed and all characters should be forced
to lowercase.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-02-23 16:07:54 +00:00
Cedric Gatay 6ea87c47f0 Incorrect line numbering in diff 
When displaying a diff, the line number always starts at one, even if the first diff is not at the first line
Fixes this to display correct line numbering on first diff
 2012-02-22 16:04:41 +01: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 af82b6773b btn padded class 2012-02-21 23:09:46 +02:00
Dmitriy Zaporozhets fb17234b05 separated buttons for sidebar 2012-02-21 22:51:18 +02:00
Dmitriy Zaporozhets 9803e0885e Project sidebar improved 2012-02-21 22:46:34 +02:00
Dmitriy Zaporozhets 1c22d4f50f Help message for wiki, styled projects page 2012-02-21 22:04:01 +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 5c492a7089 make issue, commit row title color lighter 2012-02-20 21:50:11 +02:00
Dmitriy Zaporozhets 29c41e9a0e pollishing UI 2012-02-20 21:38:59 +02:00
Dmitriy Zaporozhets 6a445b4200 fixed forgot password form 2012-02-20 20:37:37 +02:00
Dmitriy Zaporozhets 49d58492f2 Wiki abilities 2012-02-20 21:16:55 +03:00
Dmitriy Zaporozhets 22f4c1908d Some css fixes 2012-02-20 20:04:03 +02:00
Dmitriy Zaporozhets 3a33795f2b css shadow for some components 2012-02-20 19:59:39 +02: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
Dmitriy Zaporozhets 40ac2ebc21 fixed bug with branch/commit detection in select 2012-02-20 10:38:03 +02:00
Valery Sizov 2e1f119f22 wiki: markdown support 2012-02-19 22:19:31 +02:00
Valery Sizov d68f8401b3 wiki: improve history 2012-02-19 21:56:18 +02:00
Valery Sizov 85974948e7 Wiki: history 2012-02-19 21:52:05 +02:00
Dmitriy Zaporozhets 313d96e42b fixed mr counter for main menu 2012-02-19 21:34:59 +02:00
Dmitriy Zaporozhets 635d3e09b7 Issues, Merge Requests counters 2012-02-19 21:30:31 +02:00
Valery Sizov b565cd1972 Wiki: fixed main menu 2012-02-19 21:16:29 +02:00
Valery Sizov 40ce6c9131 Wiki: remove notice line 2012-02-19 19:55:37 +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
Dmitriy Zaporozhets df27ec29f3 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-02-19 16:31:17 +02:00
Dmitriy Zaporozhets 2e83de1924 fixed layout for ipad 2012-02-19 16:31:11 +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 3f91da6816 Fixed widget counts, improved styles 2012-02-18 15:59:01 +02:00
Dmitriy Zaporozhets fa7bd43ab9 How to merge instructions 2012-02-18 14:43:35 +02: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 9a24ccdea1 Fixed mistype in permissions, Fixed migration 2012-02-16 09:04:56 +02: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 3a9e5a9357 Show current commit id in branch/tag select 2012-02-15 08:46:09 +02:00
Dmitriy Zaporozhets 98f040a56f Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-02-15 01:15:08 +02:00
Dmitriy Zaporozhets 8d493019c4 Show commits for merge request immediatly 2012-02-15 01:15:02 +02:00
Valery Sizov c5a9e3cb1b Bug#326: Always empty repositories if trailing slash is missed in base_path 2012-02-15 00:43:13 +02:00
Dmitriy Zaporozhets ef396d08fc Fixed encoding issue for diff. Reordered merge request commits 2012-02-15 00:41:51 +02:00
Valery Sizov 65e4ad3147 fixed design new issue form 2012-02-15 00:33:54 +02:00
Dmitriy Zaporozhets 3230577ce0 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-02-15 00:21:07 +02:00
Dmitriy Zaporozhets 4aa2b34e79 Commit show should display author & commiter info 2012-02-15 00:21:00 +02:00
Valery Sizov 7b3b140004 fixed design login form 2012-02-15 00:15:15 +02:00
Dmitriy Zaporozhets b84b485bbe better commits list style 2012-02-15 00:10:01 +02:00
Dmitriy Zaporozhets ccfeddec46 Ignore invalid submodule entries 2012-02-14 23:53:41 +02:00
Dmitriy Zaporozhets a7bcc2eb5c submodules displayed for tree view 2012-02-14 23:48:42 +02:00
Dmitriy Zaporozhets c062e56b4c Fixed commit diff: content of removed files displayed 2012-02-14 20:00:25 +02:00
Dmitriy Zaporozhets ae416a76ff per line comments improved. replaced from dbclick to link 2012-02-14 00:20:23 +02:00
root 3f4eb731df Fixed a typo by the third n in 'commit'. 2012-02-13 20:41:16 +02:00
Dmitriy Zaporozhets 41d439401d enable markdown for email notification 2012-02-13 20:40:39 +02:00
Dmitriy Zaporozhets 7fd29a78fa Commits page styled better now 2012-02-13 00:12:18 +02:00
Dmitriy Zaporozhets ece9f50fb1 fixed unworking infinite scroll 2012-02-12 23:52:27 +02:00
Dmitriy Zaporozhets 48bc4fc214 fixed flash message. better tree css 2012-02-12 19:47:37 +02:00
Dmitriy Zaporozhets 0cd873c2d3 fixed layout for ipad. changed main width 2012-02-12 17:48:17 +02:00
Dmitriy Zaporozhets c0e622eae2 fixed main menu for firefox & opera 2012-02-12 17:34:52 +02:00
Dmitriy Zaporozhets ec01fa29fb styled top panel 2012-02-12 13:15:41 +02:00
Dmitriy Zaporozhets c844723a24 restyled main menu. move from left to top orientation 2012-02-12 02:38:38 +02:00
Dmitriy Zaporozhets 9511ec846d improved diff, restyled login page 2012-02-12 00:29:16 +02:00
Dmitriy Zaporozhets cc1ba255d6 Lists restyled, blue link colors added 2012-02-11 23:22:33 +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
Dmitriy Zaporozhets a769204ff4 Improved commit author notification 2012-02-10 10:59:39 +08:00
Dmitriy Zaporozhets c1fe37690a logo updated 2012-02-10 00:07:49 +02:00
Dmitriy Zaporozhets cd567ee40b Titled dashboard, admin, profile areas. Wider top panel. Restored search input 2012-02-09 09:59:14 +02:00
Dmitriy Zaporozhets fbd5296e32 layout refactored 2012-02-09 09:59:04 +02:00
Dmitriy Zaporozhets fcd92f9d95 Browse button in commit list 2012-02-09 09:51:50 +02:00
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