David Pursehouse
42fbc91132
Correct date label on project information page
...
The label "Created at" would be appropriate for a timestamp such
as "09:30".
However the timestamp is actually being displayed as a date in
the format "Oct 15, 2013". In this case "Created on" is better.
2013-10-18 12:10:42 +09:00
David Pursehouse
2fbe4fad13
Improve the repository import message
2013-10-15 13:58:05 +09:00
Dmitriy Zaporozhets
d1a054c513
Merge branch 'fix/relative_links_in_readme' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 18:31:57 +00:00
Dmitriy Zaporozhets
18a6f31b6a
Merge branch 'feature/api_iids' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 15:24:17 +00:00
Marin Jankovski
e649ea2fc5
Links in Readme in tree view.
2013-10-14 16:47:46 +02:00
Dmitriy Zaporozhets
d20db103c1
Merge branch 'readding_group_member' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 14:41:13 +00:00
Dmitriy Zaporozhets
eda5b3b1c5
Fix relative links from Help#API page
2013-10-14 16:47:05 +03:00
Dmitriy Zaporozhets
02693b72a4
Explain iid in API
2013-10-14 16:40:16 +03:00
Dmitriy Zaporozhets
12800e5445
Extend API Issues, MergeRequets, Milestones with iid field
2013-10-14 16:39:54 +03:00
Marin Jankovski
97cf31c4cb
Update user access level when adding to group.
2013-10-14 15:15:14 +02:00
Dmitriy Zaporozhets
ace9ff4a46
Merge pull request #5305 from saymedia/master
...
Fix the sigil for merge request emails
2013-10-14 06:13:43 -07:00
Dmitriy Zaporozhets
627cb28f11
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2013-10-14 14:08:41 +03:00
Dmitriy Zaporozhets
04aba7781a
Merge branch 'web_hook_project_id' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 10:48:05 +00:00
Dmitriy Zaporozhets
3cbfb1ee7c
Remove .git from project url end redirect
...
Ex. redirect from
localhost/group/project.git
to
localhost/group/project
It used to prevent 404 error when follow submodule http link
like http://localhost/group/project.git
2013-10-14 13:27:39 +03:00
Dmitriy Zaporozhets
55327823c4
Added links to submodules
2013-10-14 13:27:32 +03:00
Marin Jankovski
9ed59ee9f0
Include project_id in webhook payload.
2013-10-14 12:03:25 +02:00
Dmitriy Zaporozhets
2c0c9e26e8
Merge branch 'syshook-docs' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 08:46:27 +00:00
Sytse Sijbrandij
3888d94adc
System hooks docs links to admin area.
2013-10-14 09:24:38 +02:00
Dmitriy Zaporozhets
1073019d36
Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 07:00:58 +00:00
Dmitriy Zaporozhets
fdd64bf347
Merge branch 'cookies-in-redis' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 06:57:43 +00:00
Dmitriy Zaporozhets
41f63acc84
Fix README detection for subdir
2013-10-13 16:03:16 +03:00
Dmitriy Zaporozhets
5c67c88731
Improve admin dashboard UX
2013-10-13 14:38:20 +03:00
Dmitriy Zaporozhets
b65a0461d1
Revert "Move warning about 0 ssh keys to bottom of page"
...
This reverts commit 20c47923a1 .
2013-10-13 14:22:40 +03:00
Dmitriy Zaporozhets
20c47923a1
Move warning about 0 ssh keys to bottom of page
2013-10-13 11:11:10 +03:00
Dmitriy Zaporozhets
70b793eb7a
Lighter border color for ui-box. Show closed keyword for issues list
2013-10-13 11:00:51 +03:00
Dmitriy Zaporozhets
995ce5fdc7
Fix 500 error on page with submodules
2013-10-12 10:01:27 +03:00
Dmitriy Zaporozhets
d43d7471c1
Merge branch 'fix/relative_render' of /home/git/repositories/gitlab/gitlabhq
2013-10-12 05:06:19 +00:00
Marin Jankovski
ad3defa3c2
Skip relative links render in help page.
2013-10-11 21:41:33 +02:00
Sytse Sijbrandij
ba7c1764be
The cookie store is vulnerable to session replay attacks.
2013-10-11 17:54:46 +02:00
Dmitriy Zaporozhets
f81532b5b9
Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 13:02:30 +00:00
Dmitriy Zaporozhets
b883d94f96
Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 13:00:05 +00:00
Marin Jankovski
f40e0171db
Test if markdown is rendered properly.
2013-10-11 13:44:00 +02:00
Sytse Sijbrandij
39c78b71c1
Add information about admin.
2013-10-11 12:15:18 +02:00
Dmitriy Zaporozhets
10fac47527
Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 09:32:38 +00:00
Dmitriy Zaporozhets
9fa94cad56
Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 09:32:12 +00:00
Sytse Sijbrandij
6cc3bb0f8f
Explain how group and project permissions interact.
2013-10-11 10:40:22 +02:00
Marin Jankovski
c07251887c
Merge branch 'master' into relative_links_in_documentation
2013-10-11 10:00:50 +02:00
Dmitriy Zaporozhets
4123c76ec1
Merge pull request #5253 from karlhungus/feature-api-download-archive
...
Feature api download archive
2013-10-10 07:17:50 -07:00
Dmitriy Zaporozhets
69854c5625
Merge pull request #4736 from karlhungus/feature-create-wiki-repo-on-repo-enabled
...
Create a wiki when wiki_enabled:true
2013-10-10 07:17:22 -07:00
Jacob Vosmaer
cb6a86ed62
Skip rather than fail empty wikis during backup
2013-10-10 16:07:39 +02:00
Izaak Alpert
72bf6a47e0
Remove file compairson
...
Change-Id: Id2cae87c8cd383bc6cbcbdecf0f77c161bb82eab
2013-10-10 09:19:28 -04:00
Izaak Alpert
7cad12f77f
Added more tests for archive api
...
Change-Id: I2b0752bc2593a944d42dde0ffe0ef9ce408228a5
2013-10-10 09:19:28 -04:00
Izaak Alpert
a00c534c4c
Fix a bug where the tgz returned got encoded utf8
...
Conflicts:
doc/api/repositories.md
Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384
2013-10-10 09:19:28 -04:00
Izaak Alpert
ce21d8688d
feature API call to download repo archive
...
defaults to HEAD
Conflicts:
spec/requests/api/repositories_spec.rb
Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
2013-10-10 09:19:28 -04:00
Izaak Alpert
0cd28156d5
Updated missed styles
...
Change-Id: I05e02ff7e36e2350cdf5d2b94095ada9760a204e
2013-10-10 09:17:30 -04:00
Izaak Alpert
3e71af9f7f
Fix style issues
...
Change-Id: I1ffe18414b7f6eae38d7860a8e3b64a9a185273f
2013-10-10 09:17:30 -04:00
Izaak Alpert
9d5bb5a792
Brings this fix inline with updates to master
...
Change-Id: Ia50c3ac043b4c927ca59cbbdc2bba42f73e550e4
2013-10-10 09:17:30 -04:00
Izaak Alpert
af1a33917a
Create a wiki when wiki_enabled:true
...
Change-Id: I7aaab4b1f54fd2719a8a63d9069ddd5c59868e34
2013-10-10 09:17:30 -04:00
Marin Jankovski
4654999288
Merge branch 'master' into relative_links_in_documentation
2013-10-10 15:09:12 +02:00
Marin Jankovski
5b23a7bbb9
Cover a special case.
2013-10-10 14:29:16 +02:00