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

1303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets
71819dc344 logo changed for header 2012-04-22 16:01:59 +03:00
Valery Sizov
dcbb875c46 fast automerge: base implementation 2012-04-22 15:19:09 +03:00
Dmitriy Zaporozhets
ae565d24ee Increased automerge timeout. Works for 300 commits MR on repo with 200MB size 2012-04-21 13:23:44 +03:00
Dmitriy Zaporozhets
7058258a2a Fixed db_schema & reordered rake tasks 2012-04-21 12:45:43 +03:00
Dmitriy Zaporozhets
08994f3f60 Merge remote-tracking branch 'origin/merge_button' 
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
 2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets
9af14e4bda VERSION to 2.4.0 2012-04-21 12:15:17 +03:00
Dmitriy Zaporozhets
8d02d8c045 linguist gitlab fork 2012-04-21 01:48:03 +03:00
Dmitriy Zaporozhets
7c8fbe8f7f Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown 2012-04-21 01:44:52 +03:00
Dmitriy Zaporozhets
9cb51c6ea2 Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown 
Conflicts:
	Gemfile
	Gemfile.lock
 2012-04-21 01:44:15 +03:00
Dmitriy Zaporozhets
680ee045d8 Merge pull request #709 from blueyed/master 
Fix typo: "less then" => "less than"
 2012-04-20 15:27:53 -07:00
Dmitriy Zaporozhets
9c76bd9540 Project linguist integration 2012-04-21 01:26:22 +03:00
Daniel Hahler
c851639a75 Fix typo: "less then" => "less than". 2012-04-20 23:36:09 +02:00
Arthur Schreiber
5b6019f357 Using github's linguist to better detect filetypes and to do syntax highlighting. 2012-04-20 23:21:12 +02:00
Arthur Schreiber
c437e2d7d4 Switch to Redcarpet for Markdown Rendering. 
This gives us Github Flavored Markdown, which is awesome.
 2012-04-20 23:01:45 +02:00
Dmitriy Zaporozhets
9ee345750c fixed admin root path for header 2012-04-20 22:51:57 +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
60bf502bf1 Merge pull request #698 from Sindacious/master 
Display Milestones without a due date as active
 2012-04-20 00:53:20 -07:00
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
Dmitriy Zaporozhets
ac3c23f933 Merge pull request #696 from CodeBlock/patch-1 
Fix a few grammatical mistakes in profile view.
 2012-04-19 04:03:55 -07:00
Ricky Elrod
3f1a004c47 Fix a few grammatical mistakes in profile view. 2012-04-19 08:01:58 -03:00
Dmitriy Zaporozhets
ea818346a9 Merge pull request #687 from fixe/label-typo 
Fixed typo in label
 2012-04-17 23:33:15 -07:00
Dmitriy Zaporozhets
e52cb32f9a Merge pull request #686 from fixe/patch-1 
Fixed typo
 2012-04-17 23:32:53 -07:00
Tiago Ribeiro
8b5ef3c24f Fixed typo in label 2012-04-18 02:34:14 +01:00
Tiago Ribeiro
4e97ac2e3b Fixed typo 2012-04-18 02:49:02 +02: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
Valery Sizov
3a6694b551 Auto-merge: reise exception when gitlab do not have access to repo 2012-04-16 23:49:57 +03:00
Valery Sizov
5abbada41e Auto-merge: implemented lock file 2012-04-16 23:37:04 +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
86d7b4f152 removed old spec 2012-04-14 11:36:53 +03: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
Dmitriy Zaporozhets
8dc2989665 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-14 10:02:04 +03:00
Ariejan de Vroom
a1d59d8053 Merged arthurschreiber:patch-1 2012-04-13 09:28:11 +02:00
randx
497ee5fbbc Ability to block user 2012-04-13 08:12:34 +03:00
Arthur Schreiber
34b6241474 Add libyaml-dev to the apt-get install string. 
If libyaml headers are not installed, YAML will not be correctly compiled (either not at all, or using Syck instead of Psych).
 2012-04-12 19:05:19 +03:00
Dmitriy Zaporozhets
fb6d4511a0 restored dark theme 2012-04-12 00:54:07 +03:00