home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,353 Commits 48 Branches 340 Tags
0bcc323928fa3a794aea5ce190319ebea89ca1ad
Commit Graph
11353 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
Dmitriy Zaporozhets fb6cd42054 Merge branch 'hooks-migration' into 'master' 
Hooks migration

See merge request !1061
 2014-09-03 16:30:26 +00:00
Dmitriy Zaporozhets 5f6eb09cdf Improve issue filtering. Make tests pass 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 19:18:23 +03:00
Dmitriy Zaporozhets 6f423b987f Update repos hooks in migration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 17:10:41 +03:00
Dmitriy Zaporozhets e8f1331fa4 Merge branch 'internal-api-post' into 'master' 
Internal api post

See merge request !1059
 2014-09-03 11:24:08 +00:00
Dmitriy Zaporozhets 7a0e1c7238 Merge pull request #7533 from duk3luk3/system-hook-key-feature 
Add system hook for ssh key changes
 2014-09-03 14:02:58 +03:00
Dmitriy Zaporozhets a563065f3e Merge pull request #7523 from Razer6/fix_branch_delete 
Fix branch remove for branches containing a '/'
 2014-09-03 14:01:57 +03:00
Dmitriy Zaporozhets c1b31deeae Merge pull request #7211 from cirosantilli/predictable-user 
Add users with deterministic username and password to development seed.
 2014-09-03 13:56:38 +03:00
Dmitriy Zaporozhets 596bf4c2a5 Merge branch 'feaure-ldap-oauth-tests' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/lib/gitlab/oauth/user_spec.rb
 2014-09-03 13:52:40 +03:00
Dmitriy Zaporozhets cf53b361b9 Make sure /api/allowed return 200 status code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 13:33:44 +03:00
Dmitriy Zaporozhets 0a7dea29aa /api/allowed use POST now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 09:06:16 +03:00
Lukas Erlacher 40fc4261f2 Add system hook for ssh key changes 
Add system hook for ssh key create and destroy
Update and fix documentation
Update tests
 2014-09-03 01:27:02 +02:00
Sytse Sijbrandij 00ccaed029 Merge pull request #7674 from axilleas/skip_ci 
Mention [skip ci] in CONTRIBUTING.md.
 2014-09-02 16:35:18 +02:00
Achilleas Pipinellis 966d4d85ef Mention [skip ci] in CONTRIBUTING.md. 
http://docs.travis-ci.com/user/how-to-skip-a-build/
 2014-09-02 17:12:01 +03:00
Dmitriy Zaporozhets 20c2e90222 Refactor finders. Prevent circular dependency error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 15:28:27 +03:00
Dmitriy Zaporozhets 9ccef9a7b3 Merge branch 'project-tab' into 'master' 
Rename Activity to Project tab

Fixes #1544

See merge request !1058
 2014-09-02 09:23:50 +00:00
Dmitriy Zaporozhets 6438ac72fc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-02 12:22:45 +03:00
Dmitriy Zaporozhets 3a3c4ea436 Merge branch 'gitlab-shell-2-0' into 'master' 
Modify GitLab to work with gitlab-shell 2.0

Related to #1516

See merge request !1057
 2014-09-02 09:20:15 +00:00
Dmitriy Zaporozhets 19bda55fb6 Merge pull request #7663 from Razer6/all_is_not_a_valid_user 
'all' is not a valid username
 2014-09-02 11:54:06 +03:00
Dmitriy Zaporozhets 7e7f52862b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-02 11:48:57 +03:00
Dmitriy Zaporozhets a2b6c1e65f Rename activity to project tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 11:47:25 +03:00
Dmitriy Zaporozhets 7f99aa57a2 Fix specs for internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 11:35:34 +03:00
Dmitriy Zaporozhets fc65f71747 Fix post-receive specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 11:05:51 +03:00
Dmitriy Zaporozhets 730712f77e Update post-receive worker for new format 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 10:58:54 +03:00
Robert Schilling 4cfafd4475 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-02 09:14:20 +02:00
Robert Schilling 8f3585fe4a Merge pull request #7667 from bbodenmiller/patch-14 
gitlab->GitLab
 2014-09-02 08:59:40 +02:00
Robert Schilling f074a09e4d Merge pull request #7665 from bbodenmiller/rm-chmod 
remove unnecessary chmod
 2014-09-02 08:59:21 +02:00
Robert Schilling f7235c5330 Merge pull request #7586 from bbodenmiller/patch-12 
[Documentation] simplify 6.0 to 7.2 upgrade guide
 2014-09-02 08:58:37 +02:00
Ben Bodenmiller 30db1405d6 update repo recreation details 2014-09-01 22:48:57 -07:00
Ben Bodenmiller 46c3bbd78d gitlab->GitLab 2014-09-01 19:33:13 -07:00
Ben Bodenmiller 7681f8b0f7 simplify 6.0 to 7.2 upgrade guide 2014-09-01 16:41:37 -07:00
Ben Bodenmiller 60e24f4973 remove unnecessary chmod 
`lib/support/init.d/gitlab` was set as executable in the repo as of the
6.1 release so chmod is not needed after that. See
https://github.com/gitlabhq/gitlabhq/pull/7586/files#r16885445.
 2014-09-01 16:39:56 -07:00
Dmitriy Zaporozhets 7f9fa8c187 Merge branch 'api/issues-filter-state' into 'master' 
API: Filter issues by state

While working on [laboard](https://gitlab.com/jubianchi/laboard) I had some issues with the API : I was not able to filter issues by state 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, moreover, the MR API already provides such filter capabilities.

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 !168
 2014-09-01 18:03:24 +00:00
Dmitriy Zaporozhets 0306a4e2e4 Rewrite GitAccess for gitlab-shell v2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 19:57:25 +03:00
Robert Schilling 3e127a054b 'all' is not a valid username 2014-09-01 18:07:00 +02:00
Dmitriy Zaporozhets 6159ec565c Merge branch 'issue-broken-twitter-signup' into 'master' 
Ensure Oath supports providers without email response

See merge request !1054
 2014-09-01 15:51:30 +00:00
Jan-Willem van der Meer c0323b40ee Refactor: beter naming for active directory disabled users 2014-09-01 16:35:18 +02:00
Jan-Willem van der Meer 26b14dd2d5 Get uid from auth instead of info hash 
As found in the omniauth specs: https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
 2014-09-01 16:31:27 +02:00
Jan-Willem van der Meer 92a9964940 Add basic find / create specs for LDAP user 2014-09-01 15:30:46 +02:00
Dmitriy Zaporozhets 4102eb3b85 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 16:20:10 +03:00
Dmitriy Zaporozhets 83a588c316 Merge branch 'comment-and-close' into 'master' 
Comment and close

Fixes #1240

See merge request !1055
 2014-09-01 13:19:38 +00:00