home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Bodenmiller c41e5f5018 update ssl_ciphers 
taken from
https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html /
https://cipherli.st/

backwards compatible ciphers not needed since gitlab does not support
ie8
 2014-09-07 14:55:11 -07:00
Dmitriy Zaporozhets f42a1ded99 Merge pull request #7696 from Zyphrax/master 
Prevent graph spacing issue
 2014-09-07 09:49:48 +03:00
Ralf Seidler 9edf6d4dd0 Fixed trailing white space 2014-09-06 20:42:11 +02: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
Ralf Seidler 23241c181c Fixed houndci complaining over too long lines 2014-09-06 11:46:14 +02:00
Kevin Boyd 893bd8acec Incorporating Dmitriy's referrer-based routing suggestion 2014-09-05 22:35:46 +00: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
Charles Bushong 4561a09c69 Cleaning for the hound 2014-09-05 13:51:23 -04:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04: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
Ralf Seidler d93b046c4c Added search wiki feature 2014-09-05 13:36:43 +02: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
Jan-Willem van der Meer 18f88a1b76 Add new Gitlab::Oauth::AuthHash class 2014-09-04 13:00:27 +02:00
Jan-Willem van der Meer 5b86dab03b Move auth hash to a seperate class 2014-09-04 12:55:10 +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
Dmitriy Zaporozhets f0e391ce75 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-04 10:26:08 +03:00
Dmitriy Zaporozhets d62e89ba05 Enable link underline on hover for better UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 10:25:48 +03:00
Ciro Santilli 788033a2cf Factor new issue and edit MR forms. 2014-09-04 09:16:50 +02:00
Dmitriy Zaporozhets 36c3e2cc62 Explicitly require active teab for tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 10:00:04 +03:00
Robert Schilling e9b5f37acc Merge pull request #7669 from bbodenmiller/patch-16 
update repo recreation details
 2014-09-04 08:50:51 +02:00
Dmitriy Zaporozhets 93f15a4953 Explicit order of issues in API. Fixes specs for mysql db 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 22:57:32 +03:00
Dmitriy Zaporozhets f932996e10 Merge branch 'fix-issue-tests' into 'master' 
Improve issues filtering textfield

* make issue filter work visible
* update browser url so after page reload I don't loose my filter
* don't send a lot of requests - let user stop typing
* make tests finally pass!!!

See merge request !1063
 2014-09-03 16:52:10 +00:00