Commit graph

124 commits

Author SHA1 Message Date
Alex Denisov c09d233611 Merge branch 'master' into fix_project_access_notification 2012-09-26 16:14:47 +03:00
Nihad Abbasov 80bcba4ee2 install jquery-atwho-rails 2012-09-23 08:53:48 -07:00
Alex Denisov e6ce47291b master merged 2012-09-20 10:25:29 +03:00
Dmitriy Zaporozhets 486de8c3f4 Refactoring auth 2012-09-12 07:48:22 +03:00
Nihad Abbasov ef4e9c24d3 install guard-spinach 2012-09-10 06:43:49 -07:00
Nihad Abbasov ae9689f8ff remove cucumber completely 2012-09-10 06:40:57 -07:00
Nihad Abbasov decb3abf18 install spinach-rails 2012-09-10 00:42:36 -07:00
randx 8795f67f47 REmoved autotest, added notify libs for growl 2012-09-10 09:41:51 +03:00
randx a1ba470e4e Added guard 2012-09-10 09:26:35 +03:00
Alex Denisov 77bfc591bf Merge 'master' branch 2012-09-10 09:19:15 +03:00
Alex Denisov ed4fbcf6b0 Merge branch 'master' into fix_project_access_notification 2012-09-07 09:39:34 +03:00
Nihad Abbasov 2680371785 bump shoulda-matchers 2012-09-05 03:05:57 -07:00
Alex Denisov af63607a5c test_after_commit gem added 2012-09-03 21:46:17 +03:00
Nihad Abbasov 6745812c72 bump kaminari 2012-09-03 03:43:19 -07:00
randx ed8912507d gitlab_meta to 2.9 2012-08-30 22:48:01 +03:00
Robert Speicher a04b919a4c Add factory_girl_rails gem 2012-08-28 20:30:50 -04:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup
Use GitHub::Markup to parse markup files
2012-09-09 03:34:50 -07:00
Dmitriy Zaporozhets fed6ab2481 Change representation of team members. Group by role 2012-09-07 10:42:41 +03:00
Robert Speicher 1814ee0ced Give github-markup gem a version requirement 2012-09-05 17:02:23 -04:00
Robert Speicher b78fd0c130 Add github-markup gem 2012-09-05 16:50:03 -04:00
randx b962bcd4a7 draper Gemfile.lock 2012-08-22 01:25:11 +03:00
Robert Speicher af2e2e29b9 Remove unused minitest and turn gems 2012-08-23 19:21:55 -04:00
Robert Speicher 2c128f3874 Remove rails-footnotes gem and its related files 2012-08-23 19:20:28 -04:00
Dmitriy Zaporozhets a94b2d1ccf Fix meta gem version 2012-08-23 08:28:00 +03:00
Dmitriy Zaporozhets 6428d4dd63 gitlab_meta gem added 2012-08-23 08:15:30 +03:00
randx d656cb74f7 Headless gem added 2012-08-19 11:36:37 +03:00
Dmitriy Zaporozhets 813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
randx 28d903858e Switch to capybara-webkit for Cucumber 2012-08-11 23:33:49 +03:00
randx a237c802da Rails version to 3.2.8 2012-08-11 22:48:55 +03:00
randx 7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00
Jeremy Anderson 69c4cea65a updating project api to include raw blob contents and single branch 2012-07-31 07:32:44 -07:00
Jeremy Anderson e6edaa3b50 Merge remote-tracking branch 'upstream/master' 2012-07-27 22:18:04 -04:00
Jeremy Anderson 0301ba3315 updated gitignore and added rake 0.8.7 to Gemfile because of errors 2012-07-24 11:41:26 -07: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
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
randx 2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
Dmitriy Zaporozhets 318350e34f Merge branch 'api' of https://github.com/NARKOZ/gitlabhq
Conflicts:
	Gemfile.lock
2012-06-29 14:25:20 +03:00
Saito 1df1daa12e use gitlabhq/grack instead of my fork 2012-06-29 18:49:36 +08:00
Saito 7f44599ed0 integrate with gitlabhq authority 2012-06-29 15:43:15 +08:00
Saito 61b85aed59 add grack to support smart http protocal for git 2012-06-29 10:52:09 +08:00
Nihad Abbasov 4aca61e8a6 install grape and mount Gitlab::API 2012-06-28 03:42:58 -07:00
Dmitriy Zaporozhets 1b1e77c728 Issue Labels: Edit, show, index + filter 2012-06-27 21:20:35 +03:00
Dmitriy Zaporozhets 89d3366e76 Fix ldap blank password 2012-06-26 10:55:25 +03:00
randx 55f8338502 Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer 2012-06-24 09:33:22 +03:00
Nihad Abbasov da5cf9d085 downgrade raphael js to 1.5.2 2012-06-22 01:57:05 -07:00
Robb Kidd 5303cc285a Add resque_spec to test queuing mail. 2012-06-20 14:09:46 -04:00
Dmitriy Zaporozhets 316dfbaea8 Update pygments version 2012-06-20 13:45:26 +03:00
Wouter D'Haeseleer 13e7ef4b7d Update Gemfile.lock as well 2012-06-20 11:14:41 +02:00
Dmitriy Zaporozhets 5bbf3ccf05 Cucumber:
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
2012-06-15 07:15:28 +03:00