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
Valery Sizov
c083df0570
LDAP BASE IMPLEMENRTATION
2012-01-28 13:11:21 +03:00
Dmitriy Zaporozhets
ee2583e1b5
boostrap scss gem
2012-01-26 09:51:11 +02:00
Dmitriy Zaporozhets
9b6c9fe253
Merge pull request #282 from paularmstrong/rakegem
...
Adding rake to Gemfile. Fixes #48
2012-01-19 11:03:15 -08:00
Dmitriy Zaporozhets
6cf000ff52
Merge branch 'per_line_comment'
...
Conflicts:
app/assets/stylesheets/projects.css.scss
2012-01-12 00:42:17 +02:00