home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 12:36:27 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,378 Commits 48 Branches 340 Tags
e77ba96fd09efba591a9df28b4f4cab6d72569fd
Commit Graph
11378 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
Robert Schilling 392113919a Validate tag-names and references in WebUI, API 2014-09-03 13:08:36 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API 
Add specs for GitRefValidator
 2014-09-03 13:08:35 +02: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
Ciro Santilli c586192813 Fix missing to on reassign MR text email to unassigned. 
Factors out text MR and issue email.
 2014-09-03 01:33:02 +02: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