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
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
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
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
Riyad Preukschas
ce91014730
Fix use of Emoji
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
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
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
Riyad Preukschas
f120e5a89a
Use shorthand as in TreeController#edit
2012-10-15 23:40:23 +02:00
randx
809aefb828
Minor improve to UI and code formatting of gitlab web editor
2012-10-15 19:51:11 +03:00
Valeriy Sizov
42bdfd021b
WebEditor: base implementation
2012-10-12 20:07:24 +03:00
Valeriy Sizov
0b3e9fd218
WebEditor: Check if save is possible
2012-10-12 20:07:24 +03:00
Valeriy Sizov
e53b47b447
WebEditor: sceleton
2012-10-12 20:07:24 +03:00
Nihad Abbasov
317c928198
improve emoji checking performance
2012-10-05 07:23:58 -07:00
Valeriy Sizov
bd5334abc2
fix inline diff
2012-10-04 13:28:58 +03:00
Dmitriy Zaporozhets
2985697af7
Real fix for removing keys. Closes PR #1616
2012-10-03 15:56:41 +03:00
Vincent Bonmalais
1fe45898d7
Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
...
When working inside of a Vagrant box with NFS enabled, the deletion of a
repository in tmp/ doesn't work every time.
It is related to NFS inability to delete a folder if it's still used by
a resource (e.g. `rm -rf ./folder` would leave the folder and a .nfs*
file in it). In this case it's the temporary repository which can't
be deleted because `ga_repo` is still using it.
De-allocating ga_repo is not possible (thanks Ruby), but deleting the
folder it points to in the first place fixes the issue.
Reference:
http://stackoverflow.com/questions/11228079/python-remove-directory-error-file-exists
2012-09-28 16:53:02 +10:00
Robert Speicher
afc4a75499
Use Rails.root.join where appropriate
2012-09-26 16:32:26 -04:00
Robert Speicher
b389247c02
Use Commit#show instead of Commits#show to view a single commit
...
Commits#show (plural) is going to be for showing commit history on a
specific path.
2012-09-26 16:32:21 -04:00
Nihad Abbasov
4629cc44d6
fix mass assignment error in create_from_omniauth after a6a229a
2012-09-26 11:18:25 -07:00
Dmitriy Zaporozhets
ed899a2f4b
Replace sanitize with escape once
2012-09-20 11:50:22 +03:00
randx
6104942438
Sanitize for network graph
2012-09-20 09:06:12 +03:00
Robert Speicher
345c4d2a77
Update gfm so escaped text is still parsed for references
2012-09-19 20:21:35 -04:00
Saito
aaa916f15c
use high level api and compatibility with Passenger
2012-09-17 18:36:23 +08:00
Robert Speicher
d993f66642
Fix HTML entities being parsed in GFM
...
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!
Closes #1308
2012-09-13 15:20:00 -04:00
Robert Speicher
0d77209ea0
Be more resilient in the case of missing omniauth settings
...
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets
048d47e626
Refactorn oauth & ldap
2012-09-12 09:23:16 +03:00
randx
0523b4265b
Application logger
2012-09-11 23:24:53 +03:00
Cyril
e7f483f9f4
fix typo
2012-09-10 10:50:07 +02:00
randx
a56cec1132
specify gitolite-admin owner in config
2012-08-29 02:08:39 +03:00
randx
ad3a88cfd3
Prepared for gitolite v3
2012-08-29 02:03:04 +03:00
Dae Myung
8559d9a156
sending argument project but there is no project to send
2012-09-08 04:24:38 -07:00
Riyad Preukschas
d661b893c5
Prevent gfm() to leak changes to the string supplied through the _text_ argument
2012-09-08 01:58:12 +02:00
