Commit graph

3747 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
ec7a1c504f Fix tabs line height 2012-11-21 00:18:36 +02:00
Dmitriy Zaporozhets
dc9916b474 Merge pull request #1998 from erroric/gitlabhq_issue1669
fix for issue #1669
2012-11-20 14:10:45 -08:00
Dmitriy Zaporozhets
68b119f62f Merge pull request #2022 from simonoff/master
Resque must be running in the own namespace
2012-11-20 14:08:57 -08:00
Dmitriy Zaporozhets
752468b20c Merge branch 'update/bootstrap2211' of dev.gitlabhq.com:gitlabhq 2012-11-20 21:19:09 +00:00
Dmitriy Zaporozhets
4d846c09b1 Fixed spec 2012-11-20 23:18:44 +02:00
Dmitriy Zaporozhets
942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets
236584c2f8 update bootstrap to 2.2.1.1 2012-11-20 20:01:25 +02:00
Dmitriy Zaporozhets
ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03:00
Alexander Simonov
18bc873d53 Resque must be running in the own namespace 2012-11-20 18:59:37 +02:00
Alexander Simonov
10d8b77b50 Clean old rails2 style code 2012-11-20 18:59:28 +02:00
Dmitriy Zaporozhets
ed92cfdebd Fix method call for service hook 2012-11-20 16:46:22 +02:00
Hugo Duksis
a9c2500a55 Stub for Dir.chdir as it is not needed 2012-11-20 16:34:58 +02:00
Dmitriy Zaporozhets
f6248c255e User custom method for services array 2012-11-20 14:22:00 +02:00
Dmitriy Zaporozhets
93fdc4ca9d Reannotated 2012-11-20 14:19:55 +02:00
Dmitriy Zaporozhets
9f65c274ef Fix ci service creation logic 2012-11-20 14:16:04 +02:00
Hugo Duksis
e7e1e99e92 retrieve settings with symbols 2012-11-19 22:42:58 +02:00
Hugo Duksis
a8eb3fe1d2 tests for issue #1984 2012-11-19 22:42:58 +02:00
Dmitriy Zaporozhets
406a0c809b GitLabCi Service imtegration 2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets
8500743464 Post Receive Refactored. Service hooks also triggered now 2012-11-19 21:44:05 +03:00
Dmitriy Zaporozhets
95c23b2f97 Annotated. schema updated 2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets
c3b074acab Service model and service hook 2012-11-20 11:33:49 +02:00
Dmitriy Zaporozhets
be1dc5544a resque via nohup 2012-11-19 15:11:20 +02:00
Dmitriy Zaporozhets
4eef112462 Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner
Cannot remove user that owns a project.
2012-11-19 04:12:31 -08:00
Dmitriy Zaporozhets
c403c2a8e1 Merge pull request #1987 from barendt/patch-1
Update doc/development.md
2012-11-19 04:11:41 -08:00
Dmitriy Zaporozhets
cd15e89135 Merge pull request #2008 from Partugal/patch-default-order
add order for projects admin page
2012-11-19 04:11:18 -08:00
Dmitriy Zaporozhets
6878f55620 Bigger file name for commits diff 2012-11-19 14:01:40 +02:00
Dmitriy Zaporozhets
86b181398c Merge pull request #2011 from koenpunt/extended-image-diff
Optimized commit diff views, now showing file size and file mode changes
2012-11-19 04:01:49 -08:00
Dmitriy Zaporozhets
22f6e2d765 Merge pull request #2009 from gitlabhq/hook_on_mr_fix
Fix hooks for merge requests which were accepted by web-interface
2012-11-19 02:33:09 -08:00
Dmitriy Zaporozhets
36bbcc6fd6 Merge pull request #1981 from riyad/update-gems
Update Gems
2012-11-18 22:34:27 -08:00
Riyad Preukschas
20189f84ee Update gems 2012-11-18 21:51:53 +01:00
Riyad Preukschas
527d223680 Update Rails config 2012-11-18 21:51:53 +01:00
Sergey Linnik
bb3fc1e04e add order to projects admin page 2012-11-18 22:36:22 +04:00
Valeriy Sizov
e226551e81 Fix hooks for merge request which were accepted by web-interface 2012-11-18 19:56:29 +02:00
Koen Punt
3ac1f9459a Optimized commit diff views, now showing file size and file mode changes
Replaced commit status images (diff_file_*.png) with fontawesome icons
2012-11-18 17:41:41 +01:00
Riyad Preukschas
51f48392ab Fix type error if there is a different location hash 2012-11-17 22:26:22 +01:00
Valeriy Sizov
d412abd108 Merge pull request #2000 from riyad/fix-editor
Fix editor
2012-11-17 08:31:39 -08:00
Riyad Preukschas
98e938bdb0 Fix editor form, styles and JS 2012-11-17 15:43:13 +01:00
Riyad Preukschas
7caf4de2cf Fix setting Ace mode 2012-11-17 15:28:32 +01:00
Riyad Preukschas
6c1b44859d Fix Haml indenting file content 2012-11-17 01:00:26 +01:00
Alexey Loktionov
31bf0cd876 fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance 2012-11-16 22:31:17 +04:00
Marin Jankovski
19e8473eb7 Cannot remove user that owns a project.
Cannot remove user that owns a project.

Make lines shorter, set alert, use path instead of url.
2012-11-16 14:47:07 +01:00
Dmitriy Zaporozhets
b339c747a9 Merge pull request #1937 from riyad/add-file-line-links
Add file line links
2012-11-16 03:46:43 -08:00
Dmitriy Zaporozhets
c7aeb5127e Fix pre-selected assignee spinach 2012-11-16 13:03:07 +02:00
Dmitriy Zaporozhets
5d9788b05c Another try for phantom 2012-11-16 12:54:35 +02:00
Dmitriy Zaporozhets
0e9794ca5d new phantomjs for travis 2012-11-16 12:47:09 +02:00
Valeriy Sizov
5e262cf4fd Merge pull request #1995 from gitlabhq/feature/poltergeist
Use poltergeist instaead of capybara-webkit
2012-11-16 02:33:19 -08:00
Dmitriy Zaporozhets
ba25b2dc84 Use poltergeist instaead of capybara-webkit 2012-11-16 12:27:39 +02:00
Greg Barendt
8a2b136948 Update doc/development.md
Fixed a typo.
2012-11-14 13:33:22 -05:00
Riyad Preukschas
ece563296b Fix Notes JS
Also fixes #1983
2012-11-14 14:36:51 +01:00
Dmitriy Zaporozhets
433d2278e0 Rails up to 3.2.9 2012-11-14 13:14:46 +02:00