Commit graph

3466 commits

Author SHA1 Message Date
Jakob Borg 0f07922f19 'namespace' should be exposed via the API
Since it's now an integral part of the project name, it should be
visible via the API.
2013-01-02 21:31:20 +01:00
Saito 0bda2d5d2b Merge pull request #2450 from jojosch/fix-grack-gitignore
fix grack accessing files beginning with .git
2012-12-31 22:51:31 -08:00
Johannes Schleifenbaum ff976bc86c fix grack accessing files beginning with .git 2012-12-31 23:33:00 +01:00
Dmitriy Zaporozhets ffe064a2c1 Bit of cleanup and improving mailer 2012-12-31 19:46:40 +02:00
Dmitriy Zaporozhets cf3f22cc99 Corrent link for MR diff note in email 2012-12-31 19:06:49 +02:00
Dmitriy Zaporozhets 22ec3fa14c Fix MR css for accept MR block 2012-12-31 18:35:38 +02:00
Dmitriy Zaporozhets e5ff5c2869 Use project with namespace in email subject 2012-12-31 18:22:44 +02:00
Dmitriy Zaporozhets 30d6370719 Add subdir support for rewrite-hooks script 2012-12-31 17:46:40 +02:00
Dmitriy Zaporozhets 8392449599 Fix backup/restore of repos 2012-12-31 12:01:05 +02:00
Dmitriy Zaporozhets 9df17fa4c5 Merge pull request #2438 from cvut/query-perf
Optimize query for keys of repository members
2012-12-31 00:15:19 -08:00
Dmitriy Zaporozhets 0a2ac8371d Add missing subject for wall comment 2012-12-30 20:26:09 +02:00
Jakub Jirutka a54b2e80f8 Optimize query for keys of repository members
…to load them at once and then use query cache.
2012-12-30 18:54:02 +01:00
Dmitriy Zaporozhets 82ae973a99 Describe for Roles 2012-12-30 16:19:31 +02:00
Dmitriy Zaporozhets 64db5f808b use gitlab omniauth-ldap gem instead of fork 2012-12-30 15:15:56 +02:00
Dmitriy Zaporozhets d863fa6283 Replace yaml_db fork with gem 2012-12-30 14:54:08 +02:00
Dmitriy Zaporozhets 96d49bf04c Use sdoc to generate application code documentation 2012-12-30 14:43:00 +02:00
Dmitriy Zaporozhets d075df56d3 Improve perfomance of removeing group 2012-12-30 14:26:19 +02:00
Dmitriy Zaporozhets f45345edb3 Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds 2012-12-30 14:09:43 +02:00
Dmitriy Zaporozhets a16533a04a Add groups to search autocomplete. Use alphabetically scope for users order 2012-12-30 13:50:23 +02:00
Dmitriy Zaporozhets e37a043df7 Get rid of skipping callbacks in production code. Dont trigger gitolite more than once on import in group 2012-12-30 13:37:33 +02:00
Saito 151ada7645 Merge pull request #2162 from frohoff/config-improvements
support for running in non-root directory/path (RAILS_RELATIVE_URL_ROOT)
2012-12-29 12:19:07 -08:00
Riyad Preukschas cfca11f2bc Merge pull request #2423 from hopson/master
Spelling error in merge request email
2012-12-28 14:44:55 -08:00
Robert Hopson 32be082055 Update app/views/notify/new_merge_request_email.html.haml
Fix spelling of 'assignee'
2012-12-28 10:56:48 -08:00
Chris Frohoff 21e55ca318 added RAILS_RELATIVE_URL_ROOT support 2012-12-28 18:11:28 +00:00
Dmitriy Zaporozhets e9394c48ca Fix dir_exists? 2012-12-28 06:24:05 +03:00
Dmitriy Zaporozhets d03964d6ec Fixed and improved enable_naamespace migration task 2012-12-28 06:14:05 +03:00
Dmitriy Zaporozhets d991ce636b Merge pull request #2390 from simi/master
No need to install custom phantomjs for travis.
2012-12-28 01:02:43 -08:00
Dmitriy Zaporozhets 1f3bdd453e Allow spaces in project name 2012-12-28 09:29:57 +02:00
Dmitriy Zaporozhets 3de4271846 Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298 2012-12-28 09:14:28 +02:00
Dmitriy Zaporozhets c29457a396 Merge pull request #2394 from troyanov/master
fix warning 'nohup: redirecting stderr to stdout' for resque.sh
2012-12-27 06:59:52 -08:00
Dmitriy Zaporozhets 4cbb29cfad Fix not_in_project scope. Added counters in admin -> users. Improved seeds 2012-12-27 06:14:05 +03:00
Dmitriy Zaporozhets e56a47ab19 Dev fixtures: Add sample ssh key to admin 2012-12-27 12:13:18 +02:00
Dmitriy Zaporozhets dae56806df Merge pull request #2386 from cvut/fix-passenger
Fix shared Redis connection issue on Passenger
2012-12-27 01:23:17 -08:00
Andrey Kumanyaev 655b836b2a test reanimated 2012-12-26 20:31:47 +04:00
Andrey Kumanyaev c8bf5905bf Fix form url and routes path 2012-12-26 20:31:18 +04:00
Andrey Kumanyaev 98044f0f14 Code duplication removed from controllers 2012-12-26 20:30:11 +04:00
Andrey Kumanyaev 39e7a0eafe Rewrite rendering rows with users projects access in Users table in Admin group section 2012-12-26 19:52:16 +04:00
Andrey Kumanyaev 634783feb0 Rename scope "in_group" to "in_namespace" 2012-12-26 19:52:16 +04:00
Andrey Kumanyaev 1e3d238910 Replace short loop variable from "p" to "project" 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev 2753cea75a Add variable form in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev 25c5763780 Add functional in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev 9c574464a6 Add functional in admin section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev 17ea019f4e Add Project name validation 2012-12-26 19:52:15 +04:00
Valeriy Sizov c4536ae587 Merge pull request #2376 from sriharshav/fixed
Fix replace return with next in rake rask
2012-12-26 05:02:56 -08:00
anton troyanov a934bafd9f fix warning 'nohup: redirecting stderr to stdout'
related issue https://github.com/gitlabhq/gitlabhq/issues/2045
2012-12-26 16:36:40 +04:00
Riyad Preukschas 70ebcf250a Merge pull request #2381 from Razer6/update-develop-guide
Fixed broken link to developer guide, fixes #2380
2012-12-26 03:15:10 -08:00
Riyad Preukschas d803eed264 Merge pull request #2378 from PaulWagener/patch-1
Update doc/install/installation.md
2012-12-26 03:12:07 -08:00
Dmitriy Zaporozhets 5cd823847b Use gitlab resque fork. Added rake task to stop all workers 2012-12-26 11:23:43 +02:00
Dmitriy Zaporozhets 3b1519da47 Merge pull request #2388 from zzet/feature/add_errors_henlder_into_dev
Better support for error handling in dev environment
2012-12-26 00:55:08 -08:00
Josef Šimánek 103bb239e5 Update .travis.yml 2012-12-26 00:29:28 +01:00