home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,414 Commits 48 Branches 340 Tags
3e66c6a47cdac739714abe9348a4f7190fe32f0b
Commit Graph
11414 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 3e66c6a47c Merge branch 'omniauth_doc' into 'master' 
Omniauth doc

Fixes #1481

See merge request !1069
 2014-09-08 13:49:24 +00:00
Marin Jankovski 67c956e16d Link the doc in installation document. 2014-09-08 15:30:10 +02:00
Marin Jankovski 3131d0609c Merge pull request #7147 from zzet/patch-12 
Update markdown reference to external issues
 2014-09-08 14:56:29 +02:00
Jacob Vosmaer 494d15cfde Merge pull request #7258 from presto53/fix_init_scripts_interpreter 
change bash to sh in web, background_jobs scripts
 2014-09-08 14:22:53 +02:00
Marin Jankovski e59b3720e9 Move custom Omniauth directions to omniauth doc. 2014-09-08 12:27:11 +02:00
Dmitriy Zaporozhets b712ded13f Merge branch 'gitlab-development-kit' into 'master' 
Recommend the GitLab Development Kit

See merge request !1067
 2014-09-08 09:20:58 +00:00
Dmitriy Zaporozhets 1c70e21113 Merge branch 'create-hooks' into 'master' 
Use create-hooks instead of rewrite-hooks.sh

The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.

See merge request !1068
 2014-09-08 09:19:54 +00:00
Sytse Sijbrandij 1aec74f374 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-08 11:06:00 +02:00
Sytse Sijbrandij bef923055b Merge pull request #7583 from bbodenmiller/https 
[Documentation] simplify HTTPS setup details
 2014-09-08 11:05:19 +02:00
Sytse Sijbrandij 8904d86b7d Merge pull request #7580 from bbodenmiller/patch-7 
add optional nginx configs to make more secure
 2014-09-08 10:58:18 +02:00
Robert Schilling 5d543eb15e Merge pull request #7668 from bbodenmiller/patch-15 
add cleanup section to 5.0 upgrade guide
 2014-09-08 10:29:07 +02:00
Ben Bodenmiller 9a1dcf8d21 add cleanup section to 5.0 upgrade guide 
Add cleanup details to upgrade guide as gitolite and more is no longer
used
 2014-09-08 01:21:21 -07:00
Jacob Vosmaer 042465c448 Use create-hooks instead of rewrite-hooks.sh 
The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.
 2014-09-08 10:16:15 +02:00
Jacob Vosmaer 26e0741ce1 Recommend the GitLab Development Kit 2014-09-08 09:57:42 +02:00
Sytse Sijbrandij 1535835d3e Merge branch 'name-it-centos' into 'master' 
Name it centos

See merge request !1060
 2014-09-08 07:46:23 +00:00
Dmitriy Zaporozhets de6f4c3135 Merge pull request #7596 from bbodenmiller/patch-5 
add current sign-in date
 2014-09-08 09:37:21 +03:00
Ben Bodenmiller a2b36858f5 add optional nginx configs to make more secure 2014-09-07 23:17:37 -07:00
Ben Bodenmiller 5d5d4ef91a simplify HTTPS setup details 
also adds comment about updating nginx files during upgrades
 2014-09-07 15:31:13 -07:00
Dmitriy Zaporozhets f42a1ded99 Merge pull request #7696 from Zyphrax/master 
Prevent graph spacing issue
 2014-09-07 09:49:48 +03:00
Dmitriy Zaporozhets d8cbff3f1d Merge pull request #7704 from randx/sample-fork-pr 
Switch from travis to semaphoreapp
 2014-09-06 21:32:58 +03:00
Dmitriy Zaporozhets 4585ae3778 Switch from travis to semaphore 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-06 14:38:55 +03:00
Dmitriy Zaporozhets 56b08c7ec6 Semaphoreapp badge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-06 14:29:52 +03:00
Dmitriy Zaporozhets 9f505954a6 Fix tests for CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-06 13:20:37 +03:00
Dmitriy Zaporozhets bf5fb04e5c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-06 12:52:01 +03:00
Yvo van Beek 1f355279d2 Remove parent spacing. Fixes #7505 2014-09-06 19:51:28 +10:00
Robert Schilling 4034851c13 Merge pull request #7699 from mmrvka/master-pkgr 
Added cmake and pkg-config as build dependency for pkgr
 2014-09-05 22:46:06 +02:00
Martin Mrvka 20d0d5a7e8 Added cmake and pkg-config as build dependency for pkgr 2014-09-05 19:25:45 +02:00
Dmitriy Zaporozhets e77ba96fd0 Merge branch 'mr-push-note' into 'master' 
Add comment to merge request when new push happens

Fixes #1494

See merge request !1065
 2014-09-05 15:31:11 +00:00
Dmitriy Zaporozhets fd6b7b4a30 Pluralize commit text for note when push to existing MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 17:27:53 +03:00
Dmitriy Zaporozhets b0b05aa28d Add comment to merge request when new push happens 
It allows track when user added new commits to existing merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 16:56:36 +03:00
Dmitriy Zaporozhets 1767873845 Merge pull request #7193 from dloman/master 
added htmlsafe to branch list
 2014-09-05 15:51:18 +03:00
Dmitriy Zaporozhets e088777e1b Merge pull request #7470 from bbodenmiller/patch-1 
change git to git bin path
 2014-09-05 14:49:33 +03:00
Dmitriy Zaporozhets cd8503e387 Merge pull request #7252 from unaheidi/master 
Delete mailer queue
 2014-09-05 14:43:50 +03:00
Dmitriy Zaporozhets 60a98584f6 Merge pull request #7658 from Razer6/refresh_labels_page_on_delete 
Show labels help message if last label is deleted
 2014-09-05 14:39:40 +03:00
Dmitriy Zaporozhets 3a971ca9ef Fix tests by using non-exist tag names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 13:12:41 +03:00
Dmitriy Zaporozhets 3162140dfa Fix tag tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 09:36:11 +03:00
Robert Schilling bd2355191f Show labels help message if last label is deleted 2014-09-04 23:15:28 +02:00
Dmitriy Zaporozhets 66516da3c1 Explicit issues order in API. Fixes tests for mysql. Again :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 17:15:08 +03:00
Dmitriy Zaporozhets 678f3ddd6b Merge pull request #7305 from asedge/annotated_tags 
Annotated tags
 2014-09-04 16:48:54 +03:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Dmitriy Zaporozhets 69d149e0d0 Fix ugly project access icons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 16:34:07 +03:00
Dmitriy Zaporozhets 487f78be12 Merge pull request #7677 from cirosantilli/factor-issue-mr-text-email 
Fix missing to on reassign Merge Request text email to unassigned.
 2014-09-04 16:02:53 +03:00
Dmitriy Zaporozhets bd00233300 Merge pull request #7678 from cirosantilli/factor-new-issue-edit-mr 
Factor new issue and edit MR forms.
 2014-09-04 16:02:27 +03:00
Dmitriy Zaporozhets 260fd2127c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-04 15:55:14 +03:00
Dmitriy Zaporozhets 0bcc323928 Merge branch 'api/issues-filter-labels' into 'master' 
API: Filter issues by labels

While working on [laboard](https://gitlab.com/jubianchi/laboard) I had some issues with the API : I was not able to filter issues by labels so I had to write some logic to do it on my side.

I think it will be useful to have this feature supported by the Gitlab API.

I added the filtering logic on `/issues` and `/projects/:id/issues`.

The commits are not squashed but I'll do it once everything seems ok to you.

See merge request !169
 2014-09-04 12:54:08 +00:00
Dmitriy Zaporozhets 9bb1d8fc8d Merge pull request #7382 from Razer6/git_ref_validation 
Validate branch/tag-names and references WebUI, API
 2014-09-04 15:52:42 +03:00
Dmitriy Zaporozhets 640a3c5c89 Merge pull request #7661 from cirosantilli/factor-issue-mr-email 
Fix missing to on reassign Merge Request email to unassigned.
 2014-09-04 15:49:24 +03:00
Dmitriy Zaporozhets 18e4e99764 Merge branch 'sha-link' of https://github.com/cirosantilli/gitlabhq into cirosantilli-sha-link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-04 15:47:54 +03:00
jubianchiandjubianchi 0ac4a933ff Filters issues by labels via API 2014-09-04 14:41:31 +02:00
Dmitriy Zaporozhets d5c569118c Small color refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 11:00:29 +03:00