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

3767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Riyad Preukschas 527d223680 Update Rails config 2012-11-18 21:51:53 +01:00
Sergey Linnik bb3fc1e04e add order to projects admin page 2012-11-18 22:36:22 +04:00
Valeriy Sizov e226551e81 Fix hooks for merge request which were accepted by web-interface 2012-11-18 19:56:29 +02:00
Koen Punt 3ac1f9459a Optimized commit diff views, now showing file size and file mode changes 
Replaced commit status images (diff_file_*.png) with fontawesome icons
 2012-11-18 17:41:41 +01:00
Riyad Preukschas 51f48392ab Fix type error if there is a different location hash 2012-11-17 22:26:22 +01:00
Valeriy Sizov d412abd108 Merge pull request #2000 from riyad/fix-editor 
Fix editor
 2012-11-17 08:31:39 -08:00
Riyad Preukschas 98e938bdb0 Fix editor form, styles and JS 2012-11-17 15:43:13 +01:00
Riyad Preukschas 7caf4de2cf Fix setting Ace mode 2012-11-17 15:28:32 +01:00
Riyad Preukschas 6c1b44859d Fix Haml indenting file content 2012-11-17 01:00:26 +01:00
Alexey Loktionov 31bf0cd876 fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance 2012-11-16 22:31:17 +04:00
Marin Jankovski 19e8473eb7 Cannot remove user that owns a project. 
Cannot remove user that owns a project.

Make lines shorter, set alert, use path instead of url.
 2012-11-16 14:47:07 +01:00
Dmitriy Zaporozhets b339c747a9 Merge pull request #1937 from riyad/add-file-line-links 
Add file line links
 2012-11-16 03:46:43 -08:00
Dmitriy Zaporozhets c7aeb5127e Fix pre-selected assignee spinach 2012-11-16 13:03:07 +02:00
Dmitriy Zaporozhets 5d9788b05c Another try for phantom 2012-11-16 12:54:35 +02:00
Dmitriy Zaporozhets 0e9794ca5d new phantomjs for travis 2012-11-16 12:47:09 +02:00
Valeriy Sizov 5e262cf4fd Merge pull request #1995 from gitlabhq/feature/poltergeist 
Use poltergeist instaead of capybara-webkit
 2012-11-16 02:33:19 -08:00
Dmitriy Zaporozhets ba25b2dc84 Use poltergeist instaead of capybara-webkit 2012-11-16 12:27:39 +02:00
Greg Barendt 8a2b136948 Update doc/development.md 
Fixed a typo.
 2012-11-14 13:33:22 -05:00
Riyad Preukschas ece563296b Fix Notes JS 
Also fixes #1983
 2012-11-14 14:36:51 +01:00
Dmitriy Zaporozhets 433d2278e0 Rails up to 3.2.9 2012-11-14 13:14:46 +02:00
Riyad Preukschas 578cf89812 Fix specs 2012-11-14 01:20:37 +01:00
Dmitriy Zaporozhets a85e11fa51 Improved seeds for development env 2012-11-13 22:11:56 +02:00
Dmitriy Zaporozhets f0a6fbaae3 Improve Commits stats code 2012-11-13 21:26:57 +02:00
Dmitriy Zaporozhets b28ab8962b Merge pull request #1928 from kouno/cleanup-factories 
Remove backward compatibility of factories.
 2012-11-13 08:45:03 -08:00
Dmitriy Zaporozhets ed931f3a49 Merge pull request #1958 from japgolly/git_commit_fix 
Ensure git can commit and prevent it from failing silently
 2012-11-13 08:44:05 -08:00
Saito ea6359df6c Merge pull request #1968 from shtirlic/fix_thin 
Update thin closes #1765 and maybe #1051
 2012-11-13 07:32:18 -08:00
Vincent Bonmalais 80fb38de7a Remove backward compatibility of factories. 2012-11-13 22:27:45 +11:00
Dmitriy Zaporozhets 9d499b86f8 Fix loader hiding when create new project 2012-11-13 12:36:41 +02:00
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
Dmitriy Zaporozhets 3c7806c3f2 Improve lists. Remove unneccessary padding 2012-11-11 00:08:42 +02:00
Dmitriy Zaporozhets 283a9c7b7d Fix margin-right for some avatars 2012-11-10 23:45:13 +02: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
shtirlic 4abf5d06f1 Update thin closes #1765 and maybe #1051 2012-11-10 20:30:22 +04:00
Riyad Preukschas 245544a9d9 Use pygments.rb fork with a custom formatter 2012-11-10 10:47:30 +01:00
Riyad Preukschas ca54d43f99 Fix 500s because of "missing" lexer 2012-11-10 00:55:56 +01:00
Riyad Preukschas c42ada9bee Allow linking to file lines 
Supported formats: "L12" for single lines and "L12-34" for multiple lines
 2012-11-10 00:03:46 +01:00
Riyad Preukschas 45dcb1b5c4 Add jQuery.ScrollTo 2012-11-09 23:35:02 +01:00
Saito 6cec9ed328 linguist will take care of this 2012-11-10 01:36:55 +08:00
Saito b664b784f1 linguist and web browser will take care of mimetype and encoding problem. 2012-11-10 01:06:20 +08:00
Saito 5b66e08ae5 Merge pull request #1964 from jdamick/patch-1 
Update app/views/notify/project_access_granted_email.html.haml
 2012-11-09 08:09:31 -08:00
jdamick 12c0408ef5 Update app/views/notify/project_access_granted_email.html.haml 
changing wording to sound more better.
 2012-11-09 11:03:42 -05:00
Dmitriy Zaporozhets f0712f39fb charlock_holmes up to 0.6.9 for travis and setup docs 2012-11-09 15:24:28 +02:00
Dmitriy Zaporozhets 13dde2e4a4 Use grit_ext fork of gitlabhq 2012-11-09 15:17:50 +02:00
Dmitriy Zaporozhets 7528b534c6 Merge pull request #1956 from SaitoWu/grit_ext 
release a new version of grit_ext, added it into Gitlab.
 2012-11-09 05:18:15 -08:00
Valeriy Sizov fb663bd9d5 Merge pull request #1955 from dosire/patch-2 
Add pointer about alternative platforms
 2012-11-09 01:15:36 -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 8fbac65d03 bump grit_ext version to 0.6.0 2012-11-09 01:59:14 +08:00
Saito f1ac2a616b remove encode lib, clean all encoded area. 2012-11-09 01:41:07 +08:00
Saito 96211b01a8 add grit_ext to gemfile 2012-11-08 22:47:12 +08:00