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

3406 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Holden
2335d7b9cf Fix broken Note scopes with lambdas, 4.0 compat 
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
 2012-10-24 21:54:15 -07:00
Sytse Sijbrandij
bcd001f295 Refer developers to the vagrant vm and remove out of date documentation. 2012-10-24 16:45:18 +02:00
Dmitriy Zaporozhets
7ecfaccf14 Merge branch 'master' into stable 2012-10-24 16:14:03 +03:00
Dmitriy Zaporozhets
5add5f760e up to 3.0.3 2012-10-24 16:13:20 +03:00
Valery Sizov
38175209c5 Merge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq 2012-10-24 12:56:47 +00:00
Dmitriy Zaporozhets
a7efeb3781 Fix chrome issues list 2012-10-24 15:25:28 +03:00
Dmitriy Zaporozhets
6f4576b743 Spinach feature 2012-10-24 15:23:04 +03:00
Dmitriy Zaporozhets
b7a9e41bd2 Handle perfomance issue with team import. Model specs 2012-10-24 14:52:17 +03:00
Dmitriy Zaporozhets
fd0aca1225 Feature implemented 2012-10-24 14:20:53 +03:00
Valeriy Sizov
b985ff6f18 Merge pull request #1781 from iamntz/autofocus_on_issues 
Added autofocus for issue title
 2012-10-24 04:11:18 -07:00
Staicu Ionut
2d7062d8fc Added autofocus for issue title 2012-10-24 14:06:10 +03:00
Dmitriy Zaporozhets
3fa6ed8eb2 Merge branch 'master' into stable 2012-10-24 12:43:00 +03:00
Dmitriy Zaporozhets
012d62b198 v3.0.2 2012-10-24 12:41:47 +03:00
Dmitriy Zaporozhets
9f7ba5bca0 Fix schema.rb 2012-10-24 12:40:08 +03:00
Saito
e09bff082e Update doc/installation.md 
Git Smart HTTP protocol runs on `gitlab:gitlab`.
 2012-10-24 16:28:32 +08:00
Dmitriy Zaporozhets
b2df61d85a Fix 500 error on admin project if empty 2012-10-23 11:29:47 +03:00
randx
9902f1af6e Reduce line-height for commits diff lines 2012-10-22 23:49:21 +03:00
randx
e51b2d58e7 Restyled last push widget. Increased line-height for td in tables 2012-10-22 23:37:50 +03:00
Valeriy Sizov
77bc110107 API: help page and comment 2012-10-22 23:09:21 +03:00
Valeriy Sizov
6ffd2f3db6 Changes after review 2012-10-22 23:09:21 +03:00
Valeriy Sizov
93e8d426c5 API: merge request: post comment call 2012-10-22 23:09:21 +03:00
Valeriy Sizov
b32a8eea93 API: MergeRequest: authorization 2012-10-22 23:09:21 +03:00
Valeriy Sizov
524b907042 API: MergeRequest refactoring 2012-10-22 23:09:21 +03:00
Valeriy Sizov
5a89934af8 API: update merge request call 2012-10-22 23:09:21 +03:00
Valeriy Sizov
fe59547ae5 API: create merge request 2012-10-22 23:09:21 +03:00
Valeriy Sizov
bd049e5e7c API:merge request show && list 2012-10-22 23:09:21 +03:00
randx
42abdf69d5 More group tests with spinach 2012-10-22 21:42:06 +03:00
randx
83dc5f9362 Fix issue with removing group 2012-10-22 21:21:34 +03:00
Dmitriy Zaporozhets
8e7230fd99 Merge branch 'master' into stable 2012-10-22 19:02:02 +03:00
Dmitriy Zaporozhets
4bc64b5530 up to 3.0.1 2012-10-22 19:00:57 +03:00
Dmitriy Zaporozhets
893ce9ae24 Fix git over HTTP 2012-10-22 18:45:42 +03:00
Dmitriy Zaporozhets
d15643705b Merge branch 'master' into stable 2012-10-22 16:08:18 +03:00
Dmitriy Zaporozhets
da85454267 Up to v3.0.0 2012-10-22 15:49:03 +03:00
randx
351b0e758b Log OutOfMemory exceptions from Merge Requests with GitLogger 2012-10-21 20:29:19 +03:00
Dmitriy Zaporozhets
fb903de508 Merge pull request #1740 from godric7/master 
Enable Oauth login for existing regular users
 2012-10-21 09:13:35 -07:00
Dmitriy Zaporozhets
4e363c6136 Merge pull request #1605 from dosire/repo_clone_indicator 
Rewrite build_url, use web_protocol for repo indicator.
 2012-10-21 07:24:59 -07:00
Marin Jankovski
d75cc7eafd Display https as repo clone indicator and prevent modification of web_protocol variable. 
Rewrite build_url, use web_protocol for repo indicator.

Explicitly initialize custom port to make the logic obvious.
 2012-10-21 15:48:34 +02:00
Dmitriy Zaporozhets
2ff36e74eb Merge pull request #1564 from dosire/cookie_secure_setting 
Secure and httponly options on cookie.
 2012-10-21 06:14:36 -07:00
Dmitriy Zaporozhets
cd9f135a66 Merge pull request #1717 from riyad/add-author-to-tree-listing 
Update author info in tree listing
 2012-10-21 04:08:45 -07:00
randx
0189ee97ed Security for online editor. Replace dev_access?, master_access? with can? method usage 2012-10-21 12:12:14 +03:00
Dmitriy Zaporozhets
5ec1ad8b23 Merge pull request #1743 from riyad/fix-merging-bugs 
Fix merging bugs
 2012-10-21 00:37:13 -07:00
Riyad Preukschas
d4e3664067 Fix bug in MergeRequest#mark_as_unmergable 2012-10-20 15:27:34 +02:00
Riyad Preukschas
122769e358 Refactor Gitlab::Merge 
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
 2012-10-20 15:25:48 +02:00
Godric
054c15e7b5 enable Oauth login for existing regular users 
fix: https://github.com/gitlabhq/gitlabhq/issues/1620
 2012-10-20 00:38:07 +03:00
Nihad Abbasov
414080cb03 remove unnecessary snippets.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
c28722689d merge graph.js into projects.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
41ec540033 remove unnecessary loader.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
57c134c39a cleanup coffeescript code for mentions auto-complete 2012-10-19 03:41:10 -07:00
Nihad Abbasov
ec1bccb261 use 'js-' prefix for behavioral 'gfm-input' class 2012-10-19 03:41:10 -07:00
Nihad Abbasov
46921e690e cleanup main.coffee 2012-10-19 03:41:10 -07:00