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

333 commits

Author SHA1 Message Date
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
randx d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04: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
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
Dmitriy Zaporozhets 839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
randx 7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00
Riyad Preukschas eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Jakub Jirutka fa5a53f5ed Change identification of users with extern auth provider (LDAP) 2012-07-29 16:15:52 +02:00
randx 00b280c3f9 Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
Dmitriy Zaporozhets 5926bbac12 Backend Refactoring 2012-07-31 08:32:49 +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
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 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
Riyad Preukschas 34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +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 a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Ian Morgan 04a85f4582 Show wiki comments for all revisions 2012-07-20 13:16:19 -04:00
Dmitriy Zaporozhets 3063af5adc BaseContext 
Controllers refactoring with contexts
Move commit compare logic to model
 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
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04: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 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
Pat Thoyts f322975c50 Improve handling of misconfigured LDAP accounts. 
Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-16 23:31:28 +01:00
moregeek 990b9217d9 show flash notice after deletion of a project 2012-07-16 14:01:32 +02:00
randx 1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
Dmitriy Zaporozhets 4c24cabf47 Merge pull request #1012 from NARKOZ/devise 
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
 2012-07-06 08:18:18 -07:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
randx 264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
randx 1d543e6430 Finished with configs 2012-07-02 21:59:48 +03:00
randx 2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
Dmitriy Zaporozhets f73d71810e Merge pull request #1018 from glebm/master 
Resque Authentication + iFrame view
 2012-06-29 04:53:43 -07:00
gleb 2da45e9cbf Refs #1013 
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
 2012-06-29 13:46:24 +02:00
Pierre GUINOISEAU 97d74c2adc Add configurable default for projects_limit 2012-06-29 12:57:33 +02:00
randx 335f9d6410 New Feature: Diff patch file export for commit 2012-06-28 12:51:50 +03:00
randx 5f356d6928 Issues tags: refactoring 2012-06-27 23:13:44 +03:00
Dmitriy Zaporozhets 50fdb2e7df Remove critical status from Issue. Move sort instead 2012-06-27 21:30:35 +03:00