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

1310 commits

Author SHA1 Message Date
Riyad Preukschas
1f1ce5fbd4 Revamp GFM user docs. 2012-08-27 21:20:26 +02:00
Riyad Preukschas
806695f491 Split and reformat markdown options and add refs to their docs. 
Also add hard_wrap option.
 2012-08-27 21:20:13 +02:00
Riyad Preukschas
58a581782b Update forms to show consistent link to GFM. 2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets
cb35a80e49 Merge pull request #993 from veprbl/fix_archiving_prefix 
Download button: put files into a directory
 2012-08-27 11:04:00 -07:00
Dmitriy Zaporozhets
cb6fcb6562 Merge pull request #1301 from Mikulas/help-web-hooks-typo 
fix web hooks help view commit count off by one
 2012-08-27 04:58:32 -07:00
Dmitriy Zaporozhets
65444ba311 Merge pull request #1307 from purwandi/master 
use high quality icon on folder icon
 2012-08-27 01:33:06 -07:00
Purwandi
28cc4de267 Replace folder icon to use high quality 2012-08-27 12:43:28 +07:00
Alex Denisov
3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov
aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
randx
2c32574ac3 Project git clone panel 2012-08-25 23:39:01 +03:00
Dmitriy Zaporozhets
efde86537a Merge pull request #1110 from gliptak/patch-1 
Display configured git repository location on error page
 2012-08-25 13:04:41 -07:00
Dmitriy Zaporozhets
79e936e632 Merge pull request #1300 from tsigo/spec_reorganize 
Spec cleanup/reorganization
 2012-08-25 13:03:44 -07:00
Mikuláš Dítě
e0cd807020 fix web hooks help view commit count off by one 2012-08-25 20:48:30 +02:00
Robert Speicher
580ce4f2d8 Minor cleanup to Milestone model and spec 
Back-ported from my still-in-progress major cleanup.
 2012-08-25 14:19:16 -04:00
randx
6ff0652e9e Admin area -> user form 2012-08-25 20:31:19 +03:00
randx
f13bccc14b better flash message style 2012-08-25 19:47:00 +03:00
randx
c05692b7b1 scss refactoring 2012-08-25 19:42:34 +03:00
randx
fee26c58e2 Move snippets api doc to separate file 2012-08-25 19:21:11 +03:00
randx
d5fcf0f672 Show labels specific to project 2012-08-24 15:34:27 +03:00
Dmitriy Zaporozhets
8d65f51e63 Merge pull request #1295 from jouve/fix_mr_form 
fix merge request form
 2012-08-25 06:16:40 -07:00
Joe Hillenbrand
0dbde913dc Hide gravatar tip if gravatar is disabled. 2012-08-24 16:04:07 -07:00
Cyril
2b38f51a17 fix merge request form 2012-08-25 00:22:45 +02:00
randx
3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
Dmitriy Zaporozhets
52f657aa15 Merge pull request #1286 from steveklabnik/master 
Misspelled Draper
 2012-08-24 01:29:52 -07:00
Steve Klabnik
f9ab136abd Misspelled Draper 
:)
 2012-08-23 17:01:30 -07:00
Cyril
e2f19befbc fix inline forms 2012-08-23 23:04:43 +02:00
Riyad Preukschas
32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
Dmitriy Zaporozhets
0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes 
Preview window is not closed after post
 2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets
7ab587a477 Merge pull request #1263 from dosire/merge_base_for_merge_request 
Show only the commits that are newer in the merge request.
 2012-08-23 00:32:37 -07:00
Dmitriy Zaporozhets
1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar 
Allow disabling Gravatars in gitlab.yml settings
 2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets
aa50408ecb 1. Better message if no ssh key 
2. SSH Keys Help page
 2012-08-22 03:56:53 +03:00
Sytse Sijbrandij
9ec4c2d214 Show only the commits that are newer in the merge request. 2012-08-21 23:07:11 +02:00
randx
3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx
f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx
7fa6a23416 Better fonts for all code like wiki etc 2012-08-21 20:53:33 +03:00
randx
c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets
2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx
366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap 
Conflicts:
	app/models/user.rb
 2012-08-21 08:39:23 +03:00
Robert Speicher
c5b13cc989 Remove more duplication in the Notify mailer 2012-08-20 23:18:57 -04:00
Robert Speicher
652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00
randx
b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
Jakub Jirutka
335b3ed197 fix condition in find_for_ldap_auth 2012-08-20 12:58:03 +02:00
randx
d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
randx
8eaead6a01 Text message for mergeing MR 2012-08-19 00:45:46 +03:00
randx
7530fa9dec Restored margin for text in notes 2012-08-19 00:08:20 +03:00
randx
3f9749dd86 Fix branch selector. Few css fixed also 2012-08-18 23:53:58 +03: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
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
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
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
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
731b6be9c9 Handle app crash on huge commits 2012-08-11 15:59:36 +03: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
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
randx
04bad8257f Fixed markdown tests 2012-08-08 11:52:09 +03:00
Nihad Abbasov
1ec3bd3f8d ability to preview notes 2012-08-08 01:12:05 -07:00
Jakub Jirutka
ad265b9610 Adding workaround for backward compatibility with legacy LDAP users 2012-08-05 11:27:17 +02:00
randx
6171a4d8eb Fixed dashboard broken messages cause of glm 2012-08-03 03:28:02 +03:00
randx
34ba4e1352 Gitlab Markdown help page 2012-08-03 00:20:09 +03:00
Riyad Preukschas
5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas
9a0b763eec Fix missing @project errors 2012-08-06 03:16:06 +02:00
Riyad Preukschas
6f9428b1cd Fix GFM helper to raise an exception when @project is not set 2012-08-06 02:32:17 +02:00
Riyad Preukschas
8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Valeriy Sizov
1c60c3d73d Merge pull request #1147 from miks/master 
Add automatic HTML id attributes to markdown headings to allow linking to content sections in wiki
 2012-08-04 10:30:05 -07:00
Valeriy Sizov
c757924902 Merge pull request #1184 from karuna/master 
Hook url should be able to contain http basic authentication
 2012-08-04 10:17:14 -07:00
randx
7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00
randx
9b4c41f826 Fix github issue #1190 2012-08-02 09:07:01 +03:00
Valeriy Sizov
3079687b93 Merge pull request #1179 from robbytaylor/master 
Grammar fix after creating a project
 2012-08-02 09:27:10 -07:00
gitlab system
9912770c6f make hooks respect http basic authentication 2012-08-02 09:48:46 +07:00
Riyad Preukschas
eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Riyad Preukschas
0a60b19b23 Remove the commit_msg_with_link_to_issues helper and specs 2012-08-02 02:54:10 +02:00
Riyad Preukschas
6873d07f62 Add link_to_gfm helper and specs 2012-08-02 02:54:01 +02:00
Riyad Preukschas
8ce390333a Add GFM helper 2012-08-02 02:41:49 +02:00
Riyad Preukschas
e1b4e22e5c Add render context to markdown renderer 2012-08-01 17:37:12 +02:00
Rob Taylor
516a76c9a9 Fixed grammar in 'please wait' message after creating project 2012-08-01 11:19:20 +01:00
Jakub Jirutka
fa5a53f5ed Change identification of users with extern auth provider (LDAP) 2012-07-29 16:15:52 +02:00
randx
e8261313a7 Fixed firefox css bug with issues table 2012-07-28 05:43:34 +03:00