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

139 commits

Author SHA1 Message Date
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
Riyad Preukschas ce3fb94939 Fix bug where parsing of emoji was unnecessarily dependent on @project being set 2012-09-08 01:11:44 +02:00
Riyad Preukschas 5348ee6278 Fix Ruby anti-pattern in Markdown 2012-09-07 22:14:17 +02:00
randx e8f39a0a61 gitolite -> more exceptions 2012-09-07 20:43:51 +03:00
Dmitriy Zaporozhets 963746f978 Refactor gitolite_config 2012-09-07 09:15:30 +03:00
randx b994a65fc3 change gitolite backend behaviour to prevent error when config directory removed 2012-09-07 15:36:40 +03:00
Dmitriy Zaporozhets 79021e674b Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
randx 5cb9e7eedc Fix emojii 2012-09-07 09:16:04 +03:00
Robert Speicher 3a63f6f316 Simplify EMOJI_PATTERN 2012-09-06 15:26:55 -04:00
Robert Speicher 8808c5fa8d Merge branch 'master' into emoji 2012-09-06 15:23:42 -04:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Robert Speicher b3bbf53e9b Set the size of emoji to be 20x20 
Forgot they were so big!
 2012-09-05 16:14:54 -04:00
Robert Speicher 67a6a0b29b Change Gitlab::Markdown to a module; add emoji parsing 2012-09-05 16:07:39 -04:00
Robert Speicher 40d619107f Add link_title to CommitDecorator 2012-09-02 13:40:14 -04:00
randx b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
randx c48c0f95b2 Gitlab::Gitolite final fixes. Seems like all functionality is working correctly now 2012-08-29 00:33:19 +03:00
randx e8e8ca940b Fixed access to removed method 2012-08-29 00:19:34 +03:00
randx d6b2b4f069 fixed configure call within gitolite 2012-08-29 00:16:33 +03:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Dmitriy Zaporozhets 607be412d4 Merge pull request #985 from timspin/fix-gitolite-refs 
Adds refs to gitolite.conf with $ at the end
 2012-08-27 11:13:13 -07:00
Riyad Preukschas 32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
randx d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
Robert Speicher 66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Robert Speicher b039a16946 GFM refactor: Move the actual parsing to a class under the Gitlab module 2012-08-14 04:37:18 -04:00
Robert Speicher 6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Pat Thoyts 6035ad7e1f Create the githost.log file if necessary. 
This resolves issue #1121.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-21 15:32:04 +01:00
Dmitriy Zaporozhets 8803350023 CHANGELOG updated. Fixed MR bug. Logger improved 2012-07-17 08:23:16 +03:00
Dmitriy Zaporozhets 2a705c4f40 Admin logs improved. Commits list box styled 2012-07-16 08:03:10 +03:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Valeriy Sizov e3fed8aaf4 InlineDiff: fix bug "unmatched close parenthesis" 2012-07-05 00:57:12 +03:00
Valeriy Sizov 00bc0e2577 InlineDiff: small cleaning 2012-07-02 23:39:38 +03:00
Valeriy Sizov cecdb0b384 InlineDiff: refactoring 2012-07-02 23:34:25 +03:00
randx 1d543e6430 Finished with configs 2012-07-02 21:59:48 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
timspin 0ce7ad57b7 Adds refs to gitolite conf with $ at the end 2012-06-27 00:08:13 +06:00
randx f909e25d1b Improve gitlab encode method 2012-06-17 22:00:13 +03:00
randx 04bf40a923 Refactored theme css, added Modern theme pre version 2012-06-11 20:52:32 +03:00
Zevs d6ed9920d6 #888 prevent to remove source_branch 2012-06-05 00:11:07 +03:00
Zevs 3b41b1839b ability to remove source branch after merge 2012-06-05 00:11:07 +03:00
Zevs 3ffb9cbfa9 Task#879 Relocated gitolite repo and lock file 2012-06-04 21:41:26 +03:00
Saito e851cb0776 must force_encoding to utf-8 first 2012-05-30 13:40:47 +08:00
Saito efd9a717c1 solve the binary problem 2012-05-30 11:44:36 +08:00
Saito 206230a4ec rewrite encode strategy. 2012-05-29 16:16:59 +08:00
randx d72f8db08a Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding 
Conflicts:
	lib/gitlab/encode.rb
 2012-05-27 12:20:35 +03:00
randx 3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +03:00