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

2368 commits

This branch
This branch
All branches
Author SHA1 Message Date
miks 2dc0519277 bulk access roles update/deletion added 2012-09-06 23:14:42 +03:00
Robert Speicher 2faa4bba40 Update Note#upvote? to support emoji voting 2012-09-06 15:31:25 -04: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
Dmitriy Zaporozhets a595f8944a Merge pull request #1392 from NARKOZ/refactoring 
refactor factory specs
 2012-09-06 08:11:41 -07:00
Nihad Abbasov 46b9aafc39 add missing selector to projects.js 2012-09-06 07:56:33 -07:00
Nihad Abbasov d861023cb9 refactor factory specs 2012-09-06 07:52:01 -07:00
Dmitriy Zaporozhets b299385e15 Merge branch 'AlexDenisov-normalize_capitalization' 2012-09-06 17:46:57 +03:00
Dmitriy Zaporozhets b57620e23b Merge branch 'normalize_capitalization' of https://github.com/AlexDenisov/gitlabhq into AlexDenisov-normalize_capitalization 2012-09-06 17:36:04 +03:00
miks 3d3c6674fb Typo fixed 2012-09-06 16:32:26 +03:00
Dmitriy Zaporozhets 8c1b83cffe Merge pull request #1391 from NARKOZ/refactoring 
Refactoring
 2012-09-06 06:12:28 -07:00
Nihad Abbasov 66684d6d50 move code from application.js to separate file 2012-09-06 05:47:13 -07:00
Nihad Abbasov 88d394d396 cleanup projects.coffee 2012-09-06 05:44:44 -07:00
Nihad Abbasov e7c2ee57aa delete unnecessary team.js 2012-09-06 05:06:01 -07:00
Nihad Abbasov 06acc115ed rewrite snippets.js in coffeescript 2012-09-06 04:51:42 -07:00
Nihad Abbasov f8b588808e rewrite loader.js in coffeescript 2012-09-06 04:50:01 -07:00
Nihad Abbasov 08d9421dd9 rewrite graph.js in coffeescript 2012-09-06 04:32:31 -07:00
Nihad Abbasov 60e18e2636 rewrite admin.js in coffeescript 2012-09-06 04:32:01 -07:00
Nihad Abbasov c106bb7096 minor refactoring of commits controller 2012-09-06 04:03:46 -07:00
Alex Denisov 562af7a6a2 Merge branch 'master' into normalize_capitalization 2012-09-06 11:40:56 +03:00
Alex Denisov a65ce74843 Spec fixed 2012-09-06 11:40:16 +03:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
miks ab057bb5db proper Grape params hash simulation 2012-09-06 10:20:59 +03:00
Cornelio b3c8688da3 fix bulk_import for #1309 2012-09-06 08:56:46 +02:00
miks cd846ba2b5 Fix tests 2012-09-06 09:52:27 +03:00
randx e4447de23f Cucumber refactoring 2012-09-06 09:15:51 +03:00
miks 94c5054566 count against last project 2012-09-06 01:06:02 +03:00
miks e3b1f62c6b convert params hash to array 2012-09-06 00:13:25 +03:00
Sytse Sijbrandij adb724f65e Ignore chef dir. 2012-09-05 22:22:33 +02: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
miks 52e99b6eb9 Merge branch 'master' of git://github.com/gitlabhq/gitlabhq into project_users_api 2012-09-05 23:08:45 +03:00
Robert Speicher 67a6a0b29b Change Gitlab::Markdown to a module; add emoji parsing 2012-09-05 16:07:39 -04:00
Robert Speicher 90f587f4ee Move the entire gfm method to Gitlab::Markdown, which will be a module now 2012-09-05 16:06:20 -04:00
Robert Speicher 880a233e6d Add specs for parsing Emoji 2012-09-05 16:05:20 -04:00
Robert Speicher d480a478c1 Add emoji image files 2012-09-05 16:04:41 -04:00
miks 8f7360f390 API on adding users to project implemented 2012-09-05 23:01:03 +03:00
randx 21bfd1e7fc minor css improvements 2012-09-05 23:00:10 +03:00
Dmitriy Zaporozhets 19a5219746 Merge pull request #1378 from NARKOZ/validations 
validate boolean attributes
 2012-09-05 04:07:35 -07:00
Nihad Abbasov 0b559cdece add validations for boolean attributes 2012-09-05 04:01:11 -07:00
Nihad Abbasov 2680371785 bump shoulda-matchers 2012-09-05 03:05:57 -07:00
Alex Denisov 9b9dd3f9bf Unnecessary code removed 2012-09-05 11:44:47 +03:00
Dmitriy Zaporozhets 6e5cd8e081 Merge pull request #1375 from tsigo/discover_default_branch 
Default branch auto-discovery
 2012-09-05 00:04:56 -07:00
Dmitriy Zaporozhets 7c76c8d348 Merge pull request #1376 from AlexDenisov/remove_unused_routes 
Unused routes removed
 2012-09-04 23:59:43 -07:00
Alex Denisov 761c17f282 Unused routes removed 2012-09-05 09:20:02 +03:00
Dmitriy Zaporozhets 982a4095c1 Use tw style for some buttons. Improved deploy key UI 2012-09-05 08:56:59 +03:00
Robert Speicher 5e1c63d3f0 Move load_refs out of ApplicationController and into CommitsController 
That was the only place it was used.
 2012-09-05 01:13:41 -04:00
Robert Speicher a9f275bc20 Fix load_refs in ApplicationController after default_branch change 
As a last resort it was calling a method that didn't exist. Woops!
 2012-09-05 01:12:44 -04:00
Robert Speicher 861a51488a Add specs for a couple more Repository methods used by discover_default_branch 2012-09-05 01:02:30 -04:00
Robert Speicher 443e23e61a Add Repository#discover_default_branch and add it to PushObserver 2012-09-05 01:01:20 -04:00
Robert Speicher f06d98e907 Add SetDefaultBranchDefaultToNil migration 
default_branch now defaults to nil, not 'master'. It will be set after the first
push by discover_default_branch.
 2012-09-05 01:00:07 -04:00