Commit graph

3960 commits

Author SHA1 Message Date
Dmitriy Zaporozhets c90a98c55c Merge pull request #3168 from jojosch/owner-link-admin-4.2
Fix link to owner of group and team in admin interface (4.2)
2013-03-07 08:28:10 -08:00
Johannes Schleifenbaum c9556c6b60 Fix link to owner of group and team in admin interface 2013-03-07 13:10:02 +01:00
Dmitriy Zaporozhets d67117b5a1 fix team events show up 2013-02-21 09:03:07 +02:00
Dmitriy Zaporozhets 26e340fc6c Merge pull request #3001 from nafu/4-2/repo_patch
Fix file_name for archive
2013-02-18 07:13:44 -08:00
Fumiya Nakamura dc1d4eab22 Fix repository.rb archive 2013-02-15 06:03:22 -08:00
Fumiya Nakamura 24a7c0f63d Fix file_name for archive 2013-02-15 04:59:34 -08:00
Dmitriy Zaporozhets e5080755a8 Merge pull request #2947 from nafu/4.2/doc_patch
Update command to execute as git user
2013-02-13 09:25:21 -08:00
Dmitriy Zaporozhets 27975fda5d Merge pull request #2962 from donnykurnia/patch-1
Update recipe_content url to same branch
2013-02-11 22:50:11 -08:00
Donny Kurnia 4d2660777b Update recipe_content url to same branch
When checking the init.d/gitlab file, it should be using the same branch with the gitlabhq
2013-02-12 12:23:18 +07:00
Fumiya Nakamura 6ce2ff6697 Update command to execute as git user 2013-02-08 09:58:27 -08:00
Dmitriy Zaporozhets 970f86077a Up to 4.2 2013-02-08 09:02:30 +02:00
Dmitriy Zaporozhets 4bfb98ddc9 Merge pull request #2877 from former03/feature_groups_api
Add groups api
2013-02-06 03:19:29 -08:00
Dmitriy Zaporozhets 0a20f7e75e Merge pull request #2906 from redorkulated/patch-4
Update step 5 "database" (Issue #2894)
2013-02-05 04:10:28 -08:00
Dmitriy Zaporozhets 0d5a098c19 updated 2013-02-05 09:01:29 +02:00
Michael d223cddc78 Update step 5 "database" (Issue #2894)
Made it a bit clearer what step 5 is for to stop people skipping it. This time with a relative link.
2013-02-04 11:36:05 +00:00
Christian Simon 33c48ecd35 Code deduplication using inheritance for GroupDetail 2013-02-03 19:38:33 +01:00
Dmitriy Zaporozhets 85de55a120 Dont allow gitlab be loaded in iframe 2013-02-02 20:32:13 +02:00
Riyad Preukschas fac503877d Port changes from #2803 2013-02-01 21:22:40 +01:00
Riyad Preukschas 42dd006dfc Small fixes to the installation guide and check task 2013-02-01 21:06:44 +01:00
Riyad Preukschas 003c312104 Merge pull request #2440 from klamontagne/master
Don't setuid the repositories on installation
2013-02-01 20:56:03 +01:00
Christian Simon 6dba727cb2 Add test for duplicate group paths 2013-02-01 18:58:53 +01:00
Dmitriy Zaporozhets 0965aeb2ea Fix crash on team update 2013-02-01 19:07:54 +02:00
Dmitriy Zaporozhets e6002bdaff Ability to manage and remove group as owner outside of admin area 2013-02-01 19:04:11 +02:00
Dmitriy Zaporozhets 591e094e06 Add a delay for sending emails 2013-02-01 17:04:41 +02:00
Christian Simon 149ccd5d91 Fix groups api: differ between users and admin 2013-02-01 15:00:12 +01:00
Christian Simon fc0c692870 Add docs/tests for groups api 2013-02-01 14:59:22 +01:00
Dmitriy Zaporozhets d53befb0d1 Fix mailer tests 2013-02-01 15:37:21 +02:00
Christian Simon 8edc6b6a8c Add api for creating/listing/viewing groups 2013-02-01 12:11:19 +01:00
Dmitriy Zaporozhets 61833bcb74 fix app crash if author is missing 2013-02-01 09:33:12 +02:00
Dmitriy Zaporozhets cc2484c3e6 Fix sending commit note email to id instead email 2013-02-01 08:59:30 +02:00
Dmitriy Zaporozhets 5857a7a9ce Merge pull request #2839 from m4tthumphrey/protected-branches-api
Added methods to protect and unprotect branches in from the API
2013-01-31 10:44:20 -08:00
Dmitriy Zaporozhets dfe2a742c2 fix notes specs 2013-01-31 13:13:17 +02:00
Dmitriy Zaporozhets fd1b9fdc12 Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api
Conflicts:
	spec/requests/api/users_spec.rb
2013-01-31 13:00:50 +02:00
Dmitriy Zaporozhets afdb09de80 Merge pull request #2711 from fbehrens/patch-1
Update config/database.yml.postgresql
2013-01-31 02:54:48 -08:00
Dmitriy Zaporozhets 56000aea22 Merge pull request #2855 from hiroponz/fix-bug-of-network-graph
Fix bug of network graph(#2847) and trivial code clean up.
2013-01-31 02:33:59 -08:00
Dmitriy Zaporozhets 2af323bbd1 fix active tabs tests 2013-01-31 12:08:56 +02:00
Matt Humphrey 2c7554e897 Added methods to protect and unprotect branches 2013-01-31 09:26:03 +00:00
Dmitriy Zaporozhets 130f60d55b a bit of restyling. Replace some images with icons. Simplify note form 2013-01-31 11:22:06 +02:00
Sato Hiroyuki 4133221200 Fix bug of network graph(#2847) and trivial code clean up. 2013-01-31 17:48:51 +09:00
Dmitriy Zaporozhets 315fd7d746 fix routing specs 2013-01-31 10:08:20 +02:00
Dmitriy Zaporozhets 193a5624b2 add path and path_with_namespace to api project entity 2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets 563c55eb7e fix pagination issue 2013-01-31 08:55:31 +02:00
Dmitriy Zaporozhets bcc0eed3e4 missing doc for api 2013-01-31 08:46:59 +02:00
Dmitriy Zaporozhets 9da7b2e8d8 add specs for api -> merge request notes 2013-01-31 08:42:11 +02:00
Dmitriy Zaporozhets a037c9c249 Merge pull request #2842 from inome/ExposeMergeRequestAsNotable
Expose MergeRequest object as a notable in the API to allow for easy ret...
2013-01-30 22:25:02 -08:00
Dmitriy Zaporozhets 6dff742b66 Merge pull request #2852 from hiroponz/displaying-commit-on-new-window
Displaying commit on a new window, when clicking commit on network graph.
2013-01-30 22:23:33 -08:00
Dmitriy Zaporozhets d46cb3fd1c Merge pull request #2847 from hiroponz/improve-overlap-lines
Improve overlap of lines in network graph
2013-01-30 22:22:37 -08:00
Dmitriy Zaporozhets 8c50707dd4 Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph
Switchable the main branch on network graph
2013-01-30 22:21:19 -08:00
Sato Hiroyuki ad33c39800 Fix wrong path of features. 2013-01-31 13:22:08 +09:00
Sato Hiroyuki f8a2db5341 Displaying commit on a new window, when clicking commit on network graph. 2013-01-31 10:43:57 +09:00