David Barri
|
93f0a8c9b3
|
Merge remote-tracking branch 'gitlabhq/master' into git_commit_fix
Conflicts:
doc/install/installation.md
|
2012-11-11 21:27:55 +11:00 |
|
randx
|
3e04673334
|
Added feature test for stats
|
2012-11-10 23:33:10 +02:00 |
|
|
randx
|
1c5b2a5153
|
Stats page
|
2012-11-10 23:08:47 +02:00 |
|
Riyad Preukschas
|
ca54d43f99
|
Fix 500s because of "missing" lexer
|
2012-11-10 00:55:56 +01:00 |
|
Saito
|
6cec9ed328
|
linguist will take care of this
|
2012-11-10 01:36:55 +08:00 |
|
|
David Barri
|
944d3823c3
|
Fix for git commit when nothing to commit.
Turns out git commit returns with 128 when user.name config not present.
|
2012-11-09 08:32:00 +11:00 |
|
|
Saito
|
f1ac2a616b
|
remove encode lib, clean all encoded area.
|
2012-11-09 01:41:07 +08:00 |
|
|
David Barri
|
6f25967c47
|
Fixed issue with git commit silently failing.
Also updated status task and installation instuctions.
|
2012-11-08 10:47:11 +11:00 |
|
Valeriy Sizov
|
d6a5e3dad7
|
Merge pull request #1735 from NARKOZ/api
API fixes
|
2012-11-07 03:50:42 -08:00 |
|
|
Valeriy Sizov
|
0d4568db78
|
gitolite custom config
|
2012-11-07 00:47:33 +02:00 |
|
Dmitriy Zaporozhets
|
f555578414
|
Added EventFilter class. Compeleted first version of dashbaord filtering
|
2012-11-05 20:12:26 +02:00 |
|
|
randx
|
dd4d124832
|
remove accidently created file
|
2012-11-04 23:44:58 +02:00 |
|
|
randx
|
f082c8ae2a
|
Decouple and refactor GraphCommit
|
2012-11-04 23:43:33 +02:00 |
|
|
Dmitriy Zaporozhets
|
2032f4cd96
|
Fix tests fail cause of issue with grit stub
|
2012-10-31 15:22:13 +02:00 |
|
|
Dmitriy Zaporozhets
|
37e39e4176
|
Added bare import script. Removed old unworking script
|
2012-10-30 13:04:56 +02:00 |
|
|
Dmitriy Zaporozhets
|
50a6c614b5
|
Merge pull request #1818 from riyad/refactor-satellite-actions
Refactor Satellite Code
|
2012-10-29 04:12:26 -07:00 |
|
Michele Franzin
|
c370c1b389
|
gitolite's repositories folder symlinked patch
|
2012-10-27 16:12:01 +02:00 |
|
|
randx
|
72f984e3d3
|
Prevent grit from caching graph commits
|
2012-10-26 21:52:26 +03:00 |
|
|
Saito
|
4f687aaa8e
|
Merge pull request #1827 from mgrobelin/master
grack auth bugfix: allow dots in reponame
|
2012-10-26 06:35:37 -07:00 |
|
Markus Grobelin
|
bd50a9f466
|
grack: allow repositories to have dots in name, e.g. serverconfigs-example.com.git
|
2012-10-26 14:05:57 +02:00 |
|
|
Riyad Preukschas
|
904615c150
|
Update satellite action docs
|
2012-10-26 02:50:24 +02:00 |
|
|
Riyad Preukschas
|
7192f86ed0
|
Fix Satellite#lock
|
2012-10-26 02:32:17 +02:00 |
|
|
Riyad Preukschas
|
700a784bc9
|
Refactor EditFileAction#update and rename it to commit!
|
2012-10-26 01:59:50 +02:00 |
|
|
Riyad Preukschas
|
3080127354
|
Fix timeouts in MergeAction
|
2012-10-26 01:44:50 +02:00 |
|
|
Riyad Preukschas
|
0ebcc60a33
|
Move locking from Satellite::Action to Satellite and add checks
|
2012-10-26 01:44:20 +02:00 |
|
|
Riyad Preukschas
|
0e9d4f30f4
|
Refactor Satellite#clear and rename it to clear_and_update!
|
2012-10-26 01:32:33 +02:00 |
|
|
Riyad Preukschas
|
fba8ad5607
|
Move Gitlab::Satellite into the Satellite module
|
2012-10-26 00:56:24 +02:00 |
|
|
Riyad Preukschas
|
5f16687805
|
Update arguments for Gitlab::Satellite::EditFileAction#initialize
|
2012-10-26 00:39:23 +02:00 |
|
|
Riyad Preukschas
|
55779b00ea
|
Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction
|
2012-10-26 00:33:53 +02:00 |
|
|
Riyad Preukschas
|
8c89beb6f9
|
Change argument order for satellite actions to always start with the user
|
2012-10-26 00:26:47 +02:00 |
|
|
Riyad Preukschas
|
35b7a53955
|
Reorder methods in Gitlab::Satellite
|
2012-10-26 00:24:16 +02:00 |
|
|
Riyad Preukschas
|
8778961d33
|
Move prepare_satellite! to Gitlab::Satelite::Action
|
2012-10-26 00:24:02 +02:00 |
|
|
Riyad Preukschas
|
78235edda8
|
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
|
2012-10-26 00:19:01 +02:00 |
|
|
Riyad Preukschas
|
847bba9269
|
Add Gitlab::Satellite::Action
|
2012-10-26 00:10:40 +02:00 |
|
|
Riyad Preukschas
|
643ed9cbf3
|
Fix typos in Gitlab::Merge
|
2012-10-25 23:49:49 +02:00 |
|
|
Valeriy Sizov
|
4281de3640
|
API: review 2
|
2012-10-25 13:38:55 +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 |
|
|
Dmitriy Zaporozhets
|
893ce9ae24
|
Fix git over HTTP
|
2012-10-22 18:45:42 +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 |
|
|
randx
|
0189ee97ed
|
Security for online editor. Replace dev_access?, master_access? with can? method usage
|
2012-10-21 12:12:14 +03: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 |
|