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

2381 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets 93401ef988 Few css improvements 2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets 813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
Dmitriy Zaporozhets 4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter 
Allow filtering issues that have no milestone or assignee
 2012-08-16 22:33:56 -07:00
Robert Speicher feee3838e1 Combine unassigned_issue and unassigned_milestone into unassigned_filter 2012-08-16 18:13:22 -04:00
Dmitriy Zaporozhets b2c6ba97a2 Merge pull request #1230 from tsigo/hooray_apostrophes 
Correct usage of "Can't"
 2012-08-16 14:11:08 -07:00
Robert Speicher b0a901fe01 Add API for Milestones 2012-08-16 14:52:42 -04:00
Robert Speicher 66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets 05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Robert Speicher 65bcc41f3e Allow disabling Gravatars in gitlab.yml settings 
Closes #1237
 2012-08-15 21:06:08 -04:00
Dmitriy Zaporozhets 17948951ff Merge pull request #1234 from studiofrenetic/fix-admin-hook-tab 
Fix current class for hooks tab in admin section
 2012-08-15 00:08:57 -07:00
Martin Bastien 6641761e5c Fix current class for hooks tab in admin section 
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
 2012-08-15 00:03:13 -04:00
Robert Speicher 70174a1e1a More minor translation/grammar fixes on error pages 2012-08-14 17:26:38 -04:00
Dmitriy Zaporozhets 0456dd72e2 Merge pull request #1232 from tsigo/refactor_gfm 
GFM Refactoring
 2012-08-14 04:44:02 -07: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 e31a9dd253 GFM refactor: Update pattern to avoid an extra HTML entities check 2012-08-14 04:33:46 -04:00
Robert Speicher d1d19aecde GFM refactor: Simplify the regex pattern 
Makes use of 'extended' patterns to add comments to the groups, and also
reduces the total number of groups to just those that are used.
 2012-08-14 04:33:41 -04:00
Nihad Abbasov 0b7e67ad12 fix note preview link, and hide preview and errors after posting a comment 2012-08-14 01:24:27 -07:00
Robert Speicher 6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Dmitriy Zaporozhets 6ebd360cf2 Modern theme restyled. Better Profile -> Ui page 2012-08-13 08:52:10 +03:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04:00
Dmitriy Zaporozhets 463644c882 rspec to capybara-webkit. simplercov now use cucumber 2012-08-13 08:32:10 +03:00
randx 28ddc152e9 Temporary remove sqlite from travis 2012-08-12 00:36:43 +03:00
randx 528d125dbb Merge branch 'jouve-fix_commits_dashboard' 2012-08-12 00:34:14 +03:00
Dmitriy Zaporozhets a483090b73 Merge pull request #1224 from tsigo/omniauth_sample_syntax 
Fix invalid syntax in OmniAuth initializer sample
 2012-08-11 23:49:48 -07:00
Robert Speicher 91a8cd240b Fix invalid syntax in OmniAuth initializer sample 2012-08-11 19:33:59 -04:00
randx bd0c971aa9 Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard 
Conflicts:
	app/views/events/_commit.html.haml
 2012-08-12 00:33:32 +03:00
randx 28d903858e Switch to capybara-webkit for Cucumber 2012-08-11 23:33:49 +03:00
randx bb50917a29 Trying to prevent travis broken builds by increase capybara timout for cucumber 2012-08-11 23:17:18 +03:00
randx 44f79b2cb1 Add comments to Gemfile 2012-08-11 22:59:56 +03:00
randx a237c802da Rails version to 3.2.8 2012-08-11 22:48:55 +03:00
Dmitriy Zaporozhets 5867a5c21d Merge pull request #1166 from three18ti/master 
Updated MySQL docs and Ubuntu auto-install script
 2012-08-11 12:22:03 -07:00
randx 731b6be9c9 Handle app crash on huge commits 2012-08-11 15:59:36 +03:00
Dmitriy Zaporozhets ac525a74ee Merge pull request #1219 from tsigo/ruby19_hashes 
Fully embrace Ruby 1.9 hash syntax
 2012-08-11 01:26:44 -07:00
Robert Speicher 42d3295d3d Revert 1.9 Hash syntax in ValidCommit::BLOB_FILE 
Features are still expecting the 1.8 syntax, which is fine in this case.
 2012-08-10 18:38:13 -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
Cyril 15fc0f0c10 fix commit events on dashboard 2012-08-10 21:23:54 +02:00
Dmitriy Zaporozhets 1413c23c50 Merge pull request #1208 from tsigo/issue_commonality 
Consolidate functionality shared between Issue and MergeRequest
 2012-08-10 06:48:16 -07:00
Dmitriy Zaporozhets 5fd0e7ba11 Merge pull request #1198 from NARKOZ/preview_notes 
ability to preview notes
 2012-08-10 06:42:31 -07:00
Dmitriy Zaporozhets 35b45da63e Merge pull request #984 from abevoelker/fix-init.d-resque 
Fix resque worker becoming paused on restarts
 2012-08-10 06:26:04 -07:00
Nihad Abbasov 9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
Robert Speicher b7f9b8223e Fix search class method for IssueCommonality 
Also adds specs to the two affected classes that would have caught my
dumb mistake.
 2012-08-09 13:45:12 -04:00
Robert Speicher f36f0dac9d Consolidate functionality shared between Issue and MergeRequest 
Any associations, validations, delegates, scopes and methods that
were exactly the same in both Issue and MergeRequest models have been
moved to a new IssueCommonality module (role) that gets included by each
class.

There was actually quite a bit of duplication, because MergeRequests are
basically just specialized Issues.
 2012-08-08 21:44:33 -04:00
Robert Speicher 7a4c958882 Add empty IssueCommonality module; include in Issue and MergeRequest 2012-08-08 21:26:56 -04:00
Dmitriy Zaporozhets 839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Dmitriy Zaporozhets 8ffb6126a9 slim comment form 2012-08-09 06:36:55 +03:00
Dmitriy Zaporozhets a76adfa472 Fixed gfm mailer 2012-08-09 06:02:55 +03:00
randx f197fa1fbf Fix github issue #1153 2012-08-08 17:08:43 +03:00
Dmitriy Zaporozhets a8ce107c64 Cucumber feature -> Merge Request 2012-08-09 08:13:29 +03:00