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

2769 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valeriy Sizov 56bf829c75 API: fix after review 2012-10-25 13:19:18 +03:00
Valeriy Sizov e6cdfb607a API: tests for merge_requests 2012-10-25 13:13:01 +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 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 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
Riyad Preukschas 4fd73683d9 Update author info in tree view 2012-10-18 20:53:35 +02:00
Riyad Preukschas aef2031ad6 Add CommitDecorator#author_link 2012-10-18 20:16:52 +02:00
Riyad Preukschas b3a5f0a78d Fix wrong parameter order in Team#team_member_by_name_or_email 2012-10-18 20:16:52 +02:00
Saito 51ef5b9297 add shared repository doc. 2012-10-18 18:00:43 +08:00
Dmitriy Zaporozhets c007325451 Merge pull request #1712 from riyad/use-gem-for-emoji 
Use gem for Emoji
 2012-10-18 00:28:47 -07:00
Dmitriy Zaporozhets 61e5fb6f37 Merge pull request #1695 from riyad/cleanup-note-observer-and-notifications 
Code cleanup on NoteObserver and Notify
 2012-10-18 00:26:30 -07:00
Dmitriy Zaporozhets ca42e91e61 Merge pull request #1727 from gitlabhq/fix_bug_wiki 
Fix 500 error when project is empty
 2012-10-18 00:23:20 -07:00
Riyad Preukschas 413778b645 Rename NoteObserver methods and clarify things 2012-10-18 01:14:10 +02:00
Riyad Preukschas 853c69c48a Reorder and group methods in Notify mailer 2012-10-18 01:14:09 +02:00
Riyad Preukschas ce91014730 Fix use of Emoji 2012-10-18 01:10:35 +02:00
Riyad Preukschas 5d42d92c87 Remove old Emoji code and images 2012-10-18 01:10:35 +02:00
Riyad Preukschas b42c53c2e5 Add gemoji gem 2012-10-18 01:10:35 +02:00
Valeriy Sizov 883d138f15 Fix 500 error when project is empty 2012-10-17 23:59:42 +03:00
randx db469ea3e6 Fixing broken test of project last_activity 2012-10-17 22:35:08 +03:00
randx e0c43c46dd Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard 2012-10-17 22:02:52 +03:00
randx a9a3480de9 v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog 2012-10-17 22:01:27 +03:00
Valeriy Sizov 8e989d4863 revert all wiki changes 2012-10-17 16:14:20 +03:00
Valeriy Sizov 7a0a552b43 revert 2012-10-17 15:21:16 +03:00
Valeriy Sizov 31f1cebe4b Wiki style: move styles to right place 2012-10-17 15:17:27 +03:00
Valeriy Sizov 607d8b7970 Wiki Style Fixing 2012-10-17 15:09:16 +03:00
Valeriy Sizov 7166739086 Merge pull request #1715 from riyad/use-font-awesome 
Use Font Awsome for icons
 2012-10-17 03:08:12 -07:00
Valeriy Sizov d8262573b8 Merge pull request #1719 from SaitoWu/features/sharedRepository 
add shared repository support
 2012-10-17 02:27:40 -07:00
Saito 83626d05cd add shared repository support 2012-10-17 15:43:44 +08:00
Valeriy Sizov 372220d35b WebEditor: Cancel button. Confirm #1705 2012-10-17 00:27:47 +03:00