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

1150 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
e1344a08f0 Merge pull request #1163 from tomykaira/bug_1009 
Fix #1009 Replace all special characters in user's identity
 2012-07-28 07:46:40 -07:00
Dmitriy Zaporozhets
354d243878 Merge pull request #983 from JamesEarlDouglas/notify-grammar 
cleanup the wording of the notification footer
 2012-07-28 07:38:17 -07:00
tomykaira
03a2995e15 Fix #1009 Replace all special characters in user's identity 2012-07-28 22:05:25 +09:00
randx
bc7897180d Better visibility of event commit links & commits ids 2012-07-28 00:27:54 +03:00
randx
9a709f76be Fix issue padding cause PR 1144 2012-07-27 23:57:42 +03:00
Dmitriy Zaporozhets
f69049c282 Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased 
Break up links with nested formating (rebased)
 2012-07-27 13:48:05 -07:00
randx
0590aa9d60 commit.short_id as model method. Styled inline comment form 2012-07-27 11:22:05 +03:00
randx
18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
randx
c27105f8c3 Fixed dashboard loader, fixed 404 for reporter on empty wiki page. 
Styled Wiki edit page
 2012-07-26 14:45:17 +03:00
Riyad Preukschas
f6a67ef207 Update links in events 2012-07-25 22:27:25 +03:00
Riyad Preukschas
6fc6833cdb Fix styles 
* don't show pointer cursor for for the whole list item any more
* fix hover color for links in .row_title
 2012-07-25 21:11:58 +02:00
Riyad Preukschas
0aee7c94d0 Update links to milestones 2012-07-25 21:11:58 +02:00
Riyad Preukschas
e6bb4f1491 Update links to merge requests 2012-07-25 21:11:58 +02:00
Riyad Preukschas
73dabcb357 Update links to issues 2012-07-25 21:11:58 +02:00
Riyad Preukschas
cbce4528d0 Update links to commits 2012-07-25 21:11:58 +02:00
randx
14c9723724 Styled wiki area. fixed commit feed feature 2012-07-25 22:08:47 +03:00
randx
501ca8e6e8 Fix compare crash after decorator refactoring 2012-07-25 21:45:53 +03:00
randx
0296121f08 Remove recreated mailer controller for admin 2012-07-25 21:38:33 +03:00
randx
61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments 
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
 2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets
5133541f25 Merge pull request #1127 from riyad/use-decorators 
Use CommitDecorator more
 2012-07-25 11:25:55 -07:00
Dmitriy Zaporozhets
05848512bf Merge pull request #1133 from robbytaylor/master 
Updated merge request subheading.
 2012-07-25 11:22:03 -07:00
Dmitriy Zaporozhets
92d98f5a0c Merge pull request #1118 from patthoyts/pt/ldap-missing-password 
Handle LDAP missing credentials error with a flash message.
 2012-07-25 01:51:06 -07:00
Nihad Abbasov
fbb41100db update help section with issues API docs 2012-07-24 05:52:43 -07:00
Rob Taylor
dce6f7beb4 Updated merge request subheading. 
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
 2012-07-24 11:22:13 +01:00
Riyad Preukschas
34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +02:00
Riyad Preukschas
ff40b7de7a Add CommitDecorator#short_id 2012-07-21 19:59:55 +02:00
Pat Thoyts
a2d244ec06 Handle LDAP missing credentials error with a flash message. 
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.

The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit f322975.

This resolves issue #1077.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-21 09:04:05 +01:00
randx
11721b0dbe Help section for system hooks completed 2012-07-21 10:47:57 +03:00
randx
9c8a1e6517 Fix system hook example 2012-07-21 10:32:42 +03:00
randx
4261acda90 move SSH keys tab closer to begining 2012-07-21 10:27:09 +03:00
randx
a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Pat Thoyts
787e5e94ac Fix english on the edit user form. 
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-20 22:18:42 +01:00
Ian Morgan
04a85f4582 Show wiki comments for all revisions 2012-07-20 13:16:19 -04:00
Dmitriy Zaporozhets
9267cb04b0 Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq 2012-07-20 14:24:56 +00:00
Dmitriy Zaporozhets
791208431c Box shadow for boxes 2012-07-20 08:39:34 +03:00
Dmitriy Zaporozhets
3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Dmitriy Zaporozhets
3063af5adc BaseContext 
Controllers refactoring with contexts
Move commit compare logic to model
 2012-07-20 08:39:34 +03:00
Ian Morgan
36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Valeriy Sizov
d9cd6269e9 System Hooks: move callback to observer 2012-07-20 01:01:29 +03:00
Dmitriy Zaporozhets
1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Valeriy Sizov
86bd11cbd8 System Hooks: rspec 2012-07-19 00:25:10 +03:00
Valeriy Sizov
655418bed2 System hooks: fix broken tests 2012-07-19 00:25:10 +03:00
Valeriy Sizov
f5908cef19 System Hook: implemented 2012-07-19 00:25:10 +03:00
Valeriy Sizov
c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Valeriy Sizov
65dc68b35c Refactoring of hook functionality & bootsrap system hooks 2012-07-19 00:25:10 +03:00
Valeriy Sizov
72a571724d Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project 
show flash notice after deletion of a project
 2012-07-18 05:35:42 -07:00
Valeriy Sizov
3ac840ff06 Merge pull request #1100 from patthoyts/pt/ldap-no-email 
Improve handling of misconfigured LDAP accounts.
 2012-07-18 05:17:14 -07:00
Dmitriy Zaporozhets
8803350023 CHANGELOG updated. Fixed MR bug. Logger improved 2012-07-17 08:23:16 +03:00
Dmitriy Zaporozhets
494cd02b38 Colored labels for events on dashboard 2012-07-17 08:21:16 +03:00
Dmitriy Zaporozhets
a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00