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

1281 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valeriy Sizov
1db3228c33 Merge pull request #778 from netdata/Allow_short_project_names 
Allow short project names
 2012-05-03 06:15:59 -07:00
Wouter D'Haeseleer
c808295e9e Allow short project names 
We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...
 2012-05-03 12:53:24 +02:00
Ariejan de Vroom
2176e2c915 Try running against 1.9.3 again. 2012-04-30 00:45:01 +03:00
Zevs
f18339c26d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-30 00:24:59 +03:00
Zevs
c937d06c3c Task#755 auto-merge don`t work correctly. 2012-04-30 00:23:19 +03:00
Valeriy Sizov
35e602f19c small fix installation`s guide. 2012-04-29 10:39:15 +03:00
Valery Sizov
903f9491ba MR: change path to lock file 2012-04-27 01:09:23 +03:00
Valery Sizov
ff8136cda2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-27 00:55:26 +03:00
Valery Sizov
43dcc9575a Task #735 Automerge should not be checked on every load of MR show page 2012-04-27 00:53:55 +03:00
Dmitriy Zaporozhets
28cb43135c Hooks UI improved, Request tests added 2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets
91bd8fc907 Merge pull request #743 from qqshfox/fix_issue_742 
fix #742
 2012-04-26 04:05:09 -07:00
Hanfei Shen
c71222ba9e fix #742 2012-04-26 19:00:29 +08:00
Dmitriy Zaporozhets
7b7547aa00 Merge pull request #741 from mgesmundo/master 
Cosmetic change in menu
 2012-04-26 02:09:07 -07:00
mgesmundo
7c59722ddc Cosmetic change in menu 2012-04-26 11:55:46 +03:00
Valeriy Sizov
f72a5d11bd Merge pull request #732 from mmozuras/ldap_name_utf8 
Force utf-8 encoding for ldap omniauth_info.name
 2012-04-24 13:59:27 -07:00
Dmitriy Zaporozhets
2746be6ce3 Home button should targeted on root page of context 2012-04-24 21:47:01 +03:00
gitlabhq
b5fdacd153 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-24 17:52:10 +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
bbb93de17f Merge pull request #704 from tader/workaround-charlock-holmes 
Rescue from CharlockHolmes failures.
 2012-04-24 03:55:03 -07:00
Thomas A. de Ruiter
b53df22127 Rescue from CharlockHolmes failure 2012-04-24 12:43:06 +02:00
mmozuras
03cc55dba6 Force utf-8 encoding for ldap omniauth_info.name 2012-04-24 10:42:30 +03:00
Ariejan de Vroom
af99e4afe1 Merge pull request #726 from kvs/patch-1 
Fix very minor spelling issue.
 2012-04-23 23:34:00 -07:00
Kenneth Vestergaard
01bb42ae02 Fix very minor spelling issue. 2012-04-23 17:41:15 +03:00
gitlabhq
d97a9aa4a4 fixed email markdown 2012-04-23 15:32:56 +03:00
Ariejan de Vroom
21f3da2358 Make sure tmp/merge_repo is available to write lock files for auto-merge. 2012-04-23 10:54:19 +03:00
Dmitriy Zaporozhets
204c66461e corrected exception for automerge 2012-04-22 16:49:45 +03:00
Dmitriy Zaporozhets
511d07c47c Merge pull request #713 from gitlabhq/fast_automerge 
Fast automerge
 2012-04-22 06:38:39 -07:00
Valery Sizov
e5f8397fd4 fast automerge: done 2012-04-22 16:14:01 +03:00
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