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

592 commits

Author SHA1 Message Date
randx
264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
randx
1d543e6430 Finished with configs 2012-07-02 21:59:48 +03:00
randx
2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
Dmitriy Zaporozhets
f73d71810e Merge pull request #1018 from glebm/master 
Resque Authentication + iFrame view
 2012-06-29 04:53:43 -07:00
gleb
2da45e9cbf Refs #1013 
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
 2012-06-29 13:46:24 +02:00
Pierre GUINOISEAU
97d74c2adc Add configurable default for projects_limit 2012-06-29 12:57:33 +02:00
randx
335f9d6410 New Feature: Diff patch file export for commit 2012-06-28 12:51:50 +03:00
randx
5f356d6928 Issues tags: refactoring 2012-06-27 23:13:44 +03:00
Dmitriy Zaporozhets
50fdb2e7df Remove critical status from Issue. Move sort instead 2012-06-27 21:30:35 +03:00
Dmitriy Zaporozhets
1b1e77c728 Issue Labels: Edit, show, index + filter 2012-06-27 21:20:35 +03:00
James Earl Douglas
69ba86e887 fix typo: 'avaialble' -> 'available' 2012-06-26 09:17:23 -07:00
randx
6d92aa6d12 Fix IssueObserver current_user assign. Refactored observers 2012-06-24 10:01:42 +03:00
randx
193804516b Fix project redirect after destroy 2012-06-22 22:48:03 +03:00
randx
1903f6ade0 admin area -> search for users 2012-06-21 19:05:09 +03:00
randx
98a45ce6ee admin area -> search for projecs 2012-06-21 18:54:57 +03:00
randx
4ac0160a11 Hande error with huge commits 2012-06-20 20:08:18 +03:00
randx
034ddb85fe Assignee filter for issues 2012-06-18 20:50:06 +03:00
Nihad Abbasov
e735763f27 remove useless index method from projects controller 
see edd81a79c5
 2012-06-13 05:22:40 -07:00
Dmitriy Zaporozhets
a243253b10 Refactored project archive. Improved MR usability form 2012-06-13 09:03:53 +03:00
randx
edd81a79c5 Dashboard refactoring: 
* dashboard should be in dashboard controller not project index
* projects index removed
 2012-06-12 23:13:42 +03:00
randx
093159a868 Styled snippets. Raw button for snippet 2012-06-12 21:41:46 +03:00
Dmitriy Zaporozhets
e0d1fba15e Recent push event 2012-06-12 17:43:16 +03:00
Dmitriy Zaporozhets
0e33bf6eb0 Refactored IssuesController 2012-06-12 11:31:38 +03:00
Dmitriy Zaporozhets
a6dad85d2f Get rid of modularity gem, Styled 'nothing here' message 2012-06-11 13:55:38 +03:00
Zevs
3b41b1839b ability to remove source branch after merge 2012-06-05 00:11:07 +03:00
Dmitriy Zaporozhets
16427f4c40 Merge pull request #880 from NARKOZ/dashboard-feed 
Dashboard feed
 2012-06-01 07:25:54 -07:00
Nihad Abbasov
cc3c6ad0ef allow login via private token only for atom feeds 2012-06-01 06:56:28 -07:00
Nihad Abbasov
f8f6ff065e add projects atom feed 2012-05-31 23:42:02 -07:00
randx
17d4cac208 Rescue encoding error on controller level 2012-05-31 23:36:52 +03:00
Nihad Abbasov
7c7761099c fix deprecation warnings 2012-05-29 19:16:28 +05:00
randx
020caf1274 Fixed wrong module name 2012-05-27 12:34:25 +03:00
randx
d72f8db08a Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding 
Conflicts:
	lib/gitlab/encode.rb
 2012-05-27 12:20:35 +03:00
randx
d29ec9d773 Images refactored, Feed icon replaced, Fixed comment form focus 2012-05-27 01:12:28 +03:00
Gabriel Mazetto
48a36851e6 It's dangerous to rescue errors here as it will hide bugs. define_tree_vars already catch all situations where something may not exist. 2012-05-26 15:56:11 -03:00
Gabriel Mazetto
eb5749ed39 Fixed encoding problems with plain/text blobs being sent without charset. 2012-05-26 15:55:53 -03:00
randx
3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +03:00
Dmitriy Zaporozhets
1b2068eaa9 Gem updates & githost logger 
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
 2012-05-21 23:17:41 +03:00
Andrey Vakarev
fed1c98047 Refactoring: get rid of ruby antipattern unless/else and use if/else instead 2012-05-20 03:01:13 +03:00
Dmitriy Zaporozhets
1e4d15b406 Password & token split up, icon to button for top panel 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
9cd8f7b082 New Feature: Git Blame for file 2012-05-17 19:11:45 +03:00
Dmitriy Zaporozhets
28cb43135c Hooks UI improved, Request tests added 2012-04-26 20:43:12 +03:00
gitlabhq
c9af8e7579 New project page improved. User profile improved. Show issues, participant on Milestone show page. 2012-04-24 21:49:34 +03:00
Dmitriy Zaporozhets
08994f3f60 Merge remote-tracking branch 'origin/merge_button' 
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
 2012-04-21 12:22:56 +03:00
randx
35e21b3402 Admin dashboard 2012-04-20 19:41:49 +03:00
randx
1d601616a3 Pagination and better perfomance for projects page. 2012-04-20 19:11:49 +03:00
Dmitriy Zaporozhets
45b18365d5 Fix an issue with MR unavailable if remove source branch 2012-04-19 23:06:45 +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
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
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
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
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
Dmitriy Zaporozhets
11e4709fde fix compatibility with old events 2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets
90748cf724 Merge Button v1 complete 2012-03-30 20:49:34 +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
788de6f1c8 Better commit show page 2012-03-26 22:41:56 +03:00
Dmitriy Zaporozhets
8652cd8989 Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit. 2012-03-25 19:05:24 +03: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
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
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
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
5a3f23f395 Persist Merge Request diff. Auto merge request close on push 2012-03-15 00:57:43 +02:00
Dmitriy Zaporozhets
3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Andrey Janzen
34ea7fdb36 fix typo 2012-03-12 09:02:05 +07:00
Dmitriy Zaporozhets
94befdd502 Events improved. Open/close issue, merge request events displayed 2012-03-07 00:13: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
Dmitriy Zaporozhets
cb59aade4e Cleaning and refactoring 2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets
0727edd8a0 Removed issues,mr delete buttons. Refactored models 2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets
6de7dc1e67 New projects page 2012-03-03 00:09:17 +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
c94159ab08 improved dashboard 2012-03-01 20:40:32 +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
376bec26de Added dashboard page. Projects page not root from now 2012-02-28 22:59:36 +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
460eeb13b7 Increased count of notes loaded when visit wall page 2012-02-24 22:48:27 +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
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
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
9803e0885e Project sidebar improved 2012-02-21 22:46:34 +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
49d58492f2 Wiki abilities 2012-02-20 21:16:55 +03: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
Valery Sizov
85974948e7 Wiki: history 2012-02-19 21:52:05 +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
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
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
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
8d493019c4 Show commits for merge request immediatly 2012-02-15 01:15:02 +02:00
Dmitriy Zaporozhets
ef396d08fc Fixed encoding issue for diff. Reordered merge request commits 2012-02-15 00:41:51 +02:00
Dmitriy Zaporozhets
a7bcc2eb5c submodules displayed for tree view 2012-02-14 23:48:42 +02:00
Dmitriy Zaporozhets
ece9f50fb1 fixed unworking infinite scroll 2012-02-12 23:52:27 +02:00
Dmitriy Zaporozhets
cc043f32d8 Admin area improved 2012-02-11 19:56:18 +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
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
e64a174968 project membership widget. css fixes 2012-02-05 21:26:04 +02:00
Dmitriy Zaporozhets
0f83558bea fixed branch switch for code view 2012-02-05 12:23:14 +02:00
Dmitriy Zaporozhets
8ebfae9a07 Merge branch 'bootstrap' 
Conflicts:
	Gemfile
	app/views/commits/_commits.html.haml
	app/views/projects/empty.html.haml
 2012-01-30 00:45:35 +02:00
Dmitriy Zaporozhets
fca1ffb888 Bootstrap: Issues, Merge Requests, SSH Key completed 2012-01-29 23:59:12 +02:00
Dmitriy Zaporozhets
ae5faf0fd3 Ajax branch/tag switch for tree view 2012-01-29 21:30:03 +02:00
Dmitriy Zaporozhets
0a4222fb98 Bootstrap: Activities 2012-01-28 16:47:55 +02:00
vsizov
d6a0b8f428 LDAP done 2012-01-28 16:23:17 +03:00
Valery Sizov
c083df0570 LDAP BASE IMPLEMENRTATION 2012-01-28 13:11:21 +03:00
Dmitriy Zaporozhets
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
4647c6fa3a fixes raw view for text files with code like *.rb 2012-01-25 15:27:36 +02:00
Dmitriy Zaporozhets
7157305d5e cleaning dashboard & tags 2012-01-23 09:54:47 +02:00
Dmitriy Zaporozhets
e48a0b8eab usability improvements 2012-01-21 23:17:29 +02: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
8c46123f99 fixed merge request diffissues 355, 351 2012-01-20 09:49:48 +02:00
Dmitriy Zaporozhets
15c4655527 UI: add new button, top panel restyle etc 2012-01-18 22:15:45 +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
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
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
6cf000ff52 Merge branch 'per_line_comment' 
Conflicts:
	app/assets/stylesheets/projects.css.scss
 2012-01-12 00:42:17 +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
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
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
Felix Richter
10b6cb4d37 Redirect to issues list after deleting an issue in edit view 2012-01-04 13:47:57 +01: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
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
a667c71312 repo branches and tags 2011-12-31 13:12:10 +02:00
Dmitriy Zaporozhets
0ae9ac155c repo tab added. activities page for repo 2011-12-30 22:56:13 +02:00
Dmitriy Zaporozhets
61a2ce4110 code cleanin 2011-12-30 21:56:34 +02:00
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
miks
f7b911d239 Path correction 2011-12-29 23:31:27 +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
Cedric Gatay
c0b47d3245 Alert commit author on note 
Allows to alert only the commit author when a new note is added on a commit, useful when gitlabhq is used for code
reviews, allows less noise with mails...
 2011-12-24 17:28:20 +01:00
Dmitriy Zaporozhets
9a2a861276 Design tab for profile. Colorscheme as db value 2011-12-20 22:47:09 +02:00
Dmitriy Zaporozhets
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
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
7713f7fefb Notification refactoring 2011-12-17 15:58:35 +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
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
ccc9bed893 Abilities refactoring 2011-12-15 23:57:46 +02:00
Dmitriy Zaporozhets
42c46f3720 Dashboard tabs restyle, messages if no issue or merge request 2011-12-15 09:22:24 +02:00
Dmitriy Zaporozhets
3a50b6cac9 merge request show page refactored 2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets
8426846d6d fix default branch 2011-12-12 23:17:28 +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
e4b1f38c27 Added merge request dashboard, showing all merge requests assigned to 
you across projects.
 2011-12-08 01:07:02 +01:00
Ariejan de Vroom
f512418b27 Added "Issues" dashboard 
This shows issues assigned to you, across all your projects, in one
place.

References #173
 2011-12-08 00:31:06 +01:00
Dmitriy Zaporozhets
d68ec5e0fb default_branch for project & fixed project destroy 2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets
1b8f082061 new access rights implemented 2011-12-07 10:04:57 +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
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
9e089efe5a gitolite & gitosis support 2011-12-04 01:44:59 +02:00
Dmitriy Zaporozhets
79b64ef4ac fixed merge request diff 2011-11-29 20:06:37 +02:00
Dmitriy Zaporozhets
e74ec3c95a merge requests v1.0 2011-11-28 22:43:20 +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
Dmitriy Zaporozhets
6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00
Dmitriy Zaporozhets
a031813887 Commit, network graph refactoring 2011-11-27 17:35:49 +02:00
Dmitriy Zaporozhets
8ad1f8a474 activities page caching 2011-11-27 14:53:12 +02:00
Dmitriy Zaporozhets
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
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
gitlabhq
3f35cccfbd ref controller refactored 2011-11-21 01:16:10 -05:00
Dmitriy Zaporozhets
4bf4efe712 decorators & tree model 2011-11-20 22:32:12 +02:00
gitlabhq
bb35ef2f60 fix branch/tag select 2011-11-16 12:19:18 -05: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
gitlabhq
12782adf03 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-15 04:09:13 -05:00
gitlabhq
6b9f221a27 perfomance fix 2011-11-15 04:09:07 -05:00
Nihad Abbasov
368deb5992 clean up whitespace from project 2011-11-15 12:34:30 +04:00
Nihad Abbasov
415eddaf39 green specs 2011-11-15 12:13:59 +04:00
Nihad Abbasov
8d74123d61 Merge branch 'master' into features/feeds 2011-11-14 17:42:12 +04: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
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
gitlabhq
49b2fb24bc remove fluiod layout 2011-11-11 11:35:51 -05:00
gitlabhq
97cf5659aa fixed layout as default 2011-11-11 10:57:16 -05:00
Nihad Abbasov
f295ff84d9 create atom feed for issues 2011-11-11 13:29:58 +04:00
Nihad Abbasov
2b04c2a67f create atom feed for commits 2011-11-11 12:11:27 +04:00
Dmitriy Zaporozhets
d730e3ef8b refactoring project, commits controllers 2011-11-11 01:28:26 +02:00
Dmitriy Zaporozhets
dab072c1ab refactor code: repository.rb 2011-11-11 00:51:33 +02:00
Dmitriy Zaporozhets
67b9fa51dc fixed tests 2011-11-07 22:31:51 +02:00
Aleksei Kvitinskii
072b2d5de8 Implement tags cloud support for projects 2011-11-05 22:22:26 +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
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
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
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
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
e9b22a2def Merge branch 'dev' into user_dashboard 
Conflicts:
	app/views/layouts/_head_panel.html.erb
 2011-11-01 22:56:58 +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
0903932320 updated 2011-11-01 11:22:16 +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
43c1039957 don't send notification to issue creator 2011-10-31 16:49:38 +04: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
a017181339 new issue format 2011-10-28 12:22:09 +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
f1e6d9be90 Merge branch 'assets-refactoring' into dev 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/index.html.haml
 2011-10-26 23:35:17 +05:00
Nihad Abbasov
d62200cad4 clean-up code 
* Remove trailing whitespace
  * Converts hard-tabs into two-space soft-tabs
  * Remove consecutive blank lines
 2011-10-26 18:46:25 +05:00
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
9afee5ad52 Add critical status to issues 2011-10-25 07:34:02 +03:00
gitlabhq
00290b9214 test cov 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
Adam Leonard
5b284f6adf Add ability to Search issues 2011-10-22 00:06:38 -04: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
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
69e0ea6265 dashboard 2011-10-19 16:25:32 +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
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
c29b49de66 project dashboard 2011-10-18 14:33:30 +03:00
gitlabhq
783ca89796 security improved 2011-10-17 13:39:03 +03:00
gitlabhq
9265de3d25 snippets are ready 2011-10-17 00:07:10 +03:00
gitlabhq
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
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
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
eefe826f83 project tile view 2011-10-12 16:19:14 +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