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

188 commits

Author SHA1 Message Date
shtirlic 4abf5d06f1 Update thin closes #1765 and maybe #1051 2012-11-10 20:30:22 +04:00
Riyad Preukschas 245544a9d9 Use pygments.rb fork with a custom formatter 2012-11-10 10:47:30 +01:00
Dmitriy Zaporozhets 13dde2e4a4 Use grit_ext fork of gitlabhq 2012-11-09 15:17:50 +02:00
Saito 8fbac65d03 bump grit_ext version to 0.6.0 2012-11-09 01:59:14 +08:00
Saito 96211b01a8 add grit_ext to gemfile 2012-11-08 22:47:12 +08:00
Robert Speicher f61ca97648 Add quiet_assets gem, remove initializer 2012-11-01 16:45:31 -04:00
Dmitriy Zaporozhets b6fc031031 Update Gemfile with 1.9 syntax. Define ref for forks 2012-10-31 13:53:38 +02:00
Riyad Preukschas b42c53c2e5 Add gemoji gem 2012-10-18 01:10:35 +02:00
randx a9a3480de9 v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog 2012-10-17 22:01:27 +03:00
Riyad Preukschas 30a31d63da Add font-awesome-sass-rails gem 2012-10-16 20:27:44 +02:00
Saito 757b4bbc5c add rails-dev-tweaks for development env speed 2012-10-14 00:13:28 +08:00
Andrey Kumanyaev 41afd3bf16 add pg gem 2012-10-10 03:58:34 +04:00
Valeriy Sizov c4883ca225 Update linguist and pygments #1602 2012-10-02 16:29:03 +03:00
randx 80bfd6a50b gitolite-client fork replaced with origin gem 2012-09-27 17:00:13 +03:00
Robert Speicher 2ddb191706 Require 'github/markup' in Gemfile 2012-09-26 16:32:21 -04:00
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 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
 2012-09-12 06:49:52 +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 a839cb427c Fix require calls in gemfile 2012-09-10 09:43:30 +03: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 af63607a5c test_after_commit gem added 2012-09-03 21:46:17 +03: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
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
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
Dmitriy Zaporozhets 52f657aa15 Merge pull request #1286 from steveklabnik/master 
Misspelled Draper
 2012-08-24 01:29:52 -07:00
Steve Klabnik 4d9197efa8 Fix Draper spelling in Gemfile 2012-08-23 17:11:37 -07:00
Robert Speicher af2e2e29b9 Remove unused minitest and turn gems 2012-08-23 19:21:55 -04:00
Robert Speicher 4adac4deba Move gitlab_meta gem to :production group 2012-08-23 19:21:20 -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
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02: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 44f79b2cb1 Add comments to Gemfile 2012-08-11 22:59:56 +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
Valeriy Sizov 65dc68b35c Refactoring of hook functionality & bootsrap system hooks 2012-07-19 00:25:10 +03: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 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 fd44b6b69d move assets gems to assets group 2012-06-22 02:00:09 -07: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 5d39f47c4b Update to the latst grit 
The latest grit includes a patch for performance improvements.
 2012-06-19 22:24:07 +02:00
Dmitriy Zaporozhets 5bbf3ccf05 Cucumber: 
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
 2012-06-15 07:15:28 +03:00
Dmitriy Zaporozhets a6dad85d2f Get rid of modularity gem, Styled 'nothing here' message 2012-06-11 13:55:38 +03:00
Andrey Vakarev 93f3fedef5 Update rails version to 3.2.5 2012-06-08 13:28:19 +03:00
nathanvda c4d4040898 Point to the correct grit with the tag_count and branch_count methods. 2012-06-03 11:51:54 +02:00
Nihad Abbasov 865cf830c4 get rid of unused assets, use gems instead 2012-05-29 18:45:18 +05:00
Nihad Abbasov 8c7caaa69c use chosen-rails 2012-05-29 17:50:10 +05:00
Nihad Abbasov 475d9f487f use ffaker gem 2012-05-29 17:35:34 +05:00
Nihad Abbasov 078b312a31 cleanup Gemfile 2012-05-29 17:22:26 +05:00
Nihad Abbasov 632415567f use shoulda-matchers instead of shoulda gem 2012-05-29 02:35:50 +05:00
Dmitriy Zaporozhets 1b2068eaa9 Gem updates & githost logger 
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
 2012-05-21 23:17:41 +03:00
Akzhan Abdulin 7c154aa460 Use modified pygments.rb to allow dependency to rubypython 0.6.1 or above that fixes installation issues on some 64bit OSes like RHEL-based Scientific Linux 6. 2012-05-19 09:33:19 +02:00
Robb Kidd c7489578e6 Add specs for Notify ActionMailer emails. 
Covers new user, new issue and wall note emails.

Depends on email_spec (https://github.com/bmabey/email-spec/) for
friendly matchers.
 2012-05-15 22:35:53 -04:00
Dmitriy Zaporozhets be79c9def9 CSS improvements for diff & file view 2012-05-15 19:35:18 +03:00
Dmitriy Zaporozhets 39504aa19b Merge branch 'resquemailer' of https://github.com/oreofish/gitlabhq into oreofish-resquemailer 
Conflicts:
	Gemfile.lock
 2012-05-12 21:02:13 +03:00
RickXing 25b80767bd use resque mailer to send mail background 2012-05-12 17:01:09 +08:00
Robb Kidd d0eaca919b Updated gems. Specs all still pass. (Devise pinned to 1.x) 
Pinned devise to the 1.x series for the moment. Going to 2.0 threw
deprecation warnings about:
* Devise.stateless_token= (append :token_auth to Devise.skip_session_storage instead)
* devise.registrations.reasons in yml (use devise.registrations.signed_up_but_REASON)
 2012-05-10 21:46:07 +00:00
Dmitriy Zaporozhets 28cb43135c Hooks UI improved, Request tests added 2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets 8d02d8c045 linguist gitlab fork 2012-04-21 01:48:03 +03:00
Dmitriy Zaporozhets 9cb51c6ea2 Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown 
Conflicts:
	Gemfile
	Gemfile.lock
 2012-04-21 01:44:15 +03:00
Dmitriy Zaporozhets 9c76bd9540 Project linguist integration 2012-04-21 01:26:22 +03:00
Arthur Schreiber 5b6019f357 Using github's linguist to better detect filetypes and to do syntax highlighting. 2012-04-20 23:21:12 +02:00
Arthur Schreiber c437e2d7d4 Switch to Redcarpet for Markdown Rendering. 
This gives us Github Flavored Markdown, which is awesome.
 2012-04-20 23:01:45 +02:00
randx 627efddf63 migrated to bootstrap 2 2012-04-10 08:51:08 +03:00
randx 88d9569a33 Project model refactored. Modularity gem 2012-03-28 10:44:51 +03:00
Dmitriy Zaporozhets b73a33ed4d pygments up to 0.2.7 2012-03-13 20:57:59 +02:00
Valery Sizov f0fd720b4a added unicorn gemfile 2012-03-10 17:48:29 +02:00
Dmitriy Zaporozhets 55e72f4cdf Gitlab moved to mysql 2012-03-06 19:54:59 +02:00
Dmitriy Zaporozhets ed75afbb10 should up to 3.0.1 2012-03-01 21:02:59 +02:00
Dmitriy Zaporozhets bb164ebf1b Send author to post hook. Display push activity to dashboard 2012-02-29 22:38:24 +02:00
Dmitriy Zaporozhets 421451cf09 gem shoulda updated 2012-02-28 23:17:12 +02:00
Ryan Lovelett 4748ae8c8c Fixes the issue with Resque where it was complaining about :public no longer being used. 2012-02-18 09:37:58 -06:00
Saito 5b40a17333 switch ruby-debug to pry 2012-02-13 13:43:58 +08:00
Dmitriy Zaporozhets bc3735004c Moving to rails 3.2 2012-02-11 20:34:25 +02:00
Dmitriy Zaporozhets 8ebfae9a07 Merge branch 'bootstrap' 
Conflicts:
	Gemfile
	app/views/commits/_commits.html.haml
	app/views/projects/empty.html.haml
 2012-01-30 00:45:35 +02:00