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

964 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
1845429268 Use try for commit prev_commit_id detection 2012-04-19 23:35:35 +03:00
Dmitriy Zaporozhets
45b18365d5 Fix an issue with MR unavailable if remove source branch 2012-04-19 23:06:45 +03:00
James Newton
69fd4763d2 display milestones that are not marked with a due date as active 2012-04-19 13:24:02 -05:00
Ricky Elrod
3f1a004c47 Fix a few grammatical mistakes in profile view. 2012-04-19 08:01:58 -03:00
Tiago Ribeiro
8b5ef3c24f Fixed typo in label 2012-04-18 02:34:14 +01:00
Dmitriy Zaporozhets
5ef3b38429 MR commits suppressed if too many. few icons 2012-04-17 22:08:07 +03:00
Dmitriy Zaporozhets
3b7998e197 Milestone filter for issues improved 2012-04-17 21:03:01 +03:00
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