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

2150 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Denisov 85db51f660 don't send notification when UsersProject destroyed 2012-09-07 10:23:45 +03:00
Alex Denisov ed4fbcf6b0 Merge branch 'master' into fix_project_access_notification 2012-09-07 09:39:34 +03:00
randx 5cb9e7eedc Fix emojii 2012-09-07 09:16:04 +03:00
Dmitriy Zaporozhets 4f8a4aa44c Merge pull request #1384 from tsigo/emoji 
Emoji!
 2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets 7c0a1068bf Merge pull request #1363 from AlexDenisov/api_create_project_fixes 
API create project fixes
 2012-09-06 23:00:04 -07:00
Dmitriy Zaporozhets 687dc0dc58 Merge pull request #1385 from dosire/ignore_chef_dir 
Ignore chef dir.
 2012-09-06 22:58:10 -07:00
Dmitriy Zaporozhets 805d408f0f Merge pull request #1397 from tsigo/fix_markdown_help 
Fix Markdown help page
 2012-09-06 22:48:00 -07:00
Nihad Abbasov 0eb8a03981 add mysql service for travis-ci 
see http://about.travis-ci.org/blog/august-2012-upcoming-ci-environment-updates
 2012-09-07 07:01:04 +06:00
Robert Speicher 8fdeb43c36 Fix Help/Markdown: Take 2 2012-09-06 17:20:57 -04:00
Robert Speicher 34a48d55cc Revert "Change @project instance variable to a local in views/help/markdown" 
This reverts commit 6471d8c652.
 2012-09-06 17:17:56 -04:00
Robert Speicher 8f3b1d6ea4 Fix spec broken by bde19c0 2012-09-06 17:05:23 -04:00
Robert Speicher bde19c061a Update failure message for UsersProject uniqueness validation 
Was "User has already been taken", is now "User already exists in
project".
 2012-09-06 16:51:28 -04: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
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
randx e4447de23f Cucumber refactoring 2012-09-06 09:15:51 +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
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
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