home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,353 Commits 48 Branches 340 Tags
0bcc323928fa3a794aea5ce190319ebea89ca1ad
Commit Graph
5712 Commits
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 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 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 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
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
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 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 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
Dmitriy Zaporozhets 4102eb3b85 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 16:20:10 +03:00
Dmitriy Zaporozhets 99425a124c Post comment when hit close/reopen btn in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 15:37:53 +03:00
Dmitriy Zaporozhets 31773f4dd7 Merge branch 'milestone_percentage' into 'master' 
Show milestone percentage in detail page, fixes #485

#### What does this MR do?

This MR adds the percentage count also to the milestone detail page.

##### Why was this MR needed?

Currently, this is only shown in the overview list.

##### What are the relevant issue numbers?

#485

###### Screenshots

![Screenshot 2014-08-17 21.14.27](https://gitlab.com/uploads/razer6/gitlab-ce/27e6f20bf2/Screenshot_2014-08-17_21.14.27.png)

See merge request !170
 2014-09-01 11:35:43 +00:00
Dmitriy Zaporozhets 2dc31b76aa Merge pull request #7409 from robbytaylor/feature/remove-redundant-spans 
Removed redundant spans
 2014-09-01 14:14:38 +03:00
Dmitriy Zaporozhets 94e7138bdb Merge pull request #7406 from robbytaylor/feature/group-row-padding 
Moved padding from li to a in dashboard groups / projects listing
 2014-09-01 14:04:12 +03:00
Dmitriy Zaporozhets 20dbc2a139 Merge pull request #7425 from Razer6/remove_dup_javascript 
Remove duplicated setupNoteForm method
 2014-09-01 14:03:10 +03:00
Dmitriy Zaporozhets 8235d3ecdf Merge pull request #7659 from Razer6/feature/shortcuts 
Awesome keyboard shortcuts for GitLab
 2014-09-01 13:47:44 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Ciro Santilli 81336bd2b5 Add permalink to fixed SHA URL on blob view. 2014-09-01 10:26:47 +02:00
Achilleas Pipinellis a870bc9ddf Modify empty project instructions to use double quotes for commit msg. 
http://feedback.gitlab.com/forums/176466-general/suggestions/6006904-modify-instruction-to-use-double-quotes-for-windo
 2014-08-31 01:08:01 +03:00
Ciro Santilli af7b19003c Comment typo. 2014-08-29 20:11:57 +02:00
Ciro Santilli 5317c26cf7 Comment typo. 2014-08-29 19:35:04 +02:00
Dmitriy Zaporozhets f2befb6934 Merge pull request #7221 from mcmillion/fix-issue-comment-rss-feed 
Fix Atom feed for comments
 2014-08-29 17:48:37 +03:00
Dmitriy Zaporozhets 933d2dcc97 Merge pull request #7634 from zzet/patch-11 
Return extra empty line in blob render
 2014-08-29 17:43:51 +03:00
Dmitriy Zaporozhets dae9faf340 Merge pull request #7519 from jvanbaarsen/enable-blame-highlighting 
Enable highlighting for blame
 2014-08-29 17:38:50 +03:00
Andrew Kumanyaev 039976af46 Return extra empty line in blob render 2014-08-29 17:17:43 +04:00
Dmitriy Zaporozhets 8aca1ff003 Merge branch 'deny-system-notes-edit' into 'master' 
Don't allow edit of system notes

Fix #1412

See merge request !1052
 2014-08-29 13:16:26 +00:00
Dmitriy Zaporozhets ad98c8c9ef Merge branch 'improve-issue-ui' into 'master' 
Improve issue ui

Fix code overflow for description block

See merge request !1051
 2014-08-29 12:45:54 +00:00
Dmitriy Zaporozhets 49313946da Remove unnecessary color styling for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:26:24 +03:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets fc76267288 Pre-wrap code blocks in issue description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 14:55:54 +03:00
Dmitriy Zaporozhets 36361f4e45 Prevent 500 error when browse wiki page with repo access 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 12:58:47 +03:00
Jacob Vosmaer d4180875cb Merge branch 'fix-xss' into 'master' 
Fix XSS issue

When view blob as RAW make sure we allow only 2 kind of type: 'text/plain' and 'application/octet-stream'

Fixes #1514

See merge request !1045
 2014-08-28 15:59:57 +00:00
Dmitriy Zaporozhets ef4848a6ff Merge pull request #7609 from cirosantilli/rm-haml-strings 
[refactor] Remove HAML eval for const strings.
 2014-08-28 16:52:18 +03:00
Dmitriy Zaporozhets c8514bece9 Merge pull request #7621 from dreis2211/overflow-my-projects-list 
Fix overflow in 'my projects' list
 2014-08-28 16:51:56 +03:00
Dmitriy Zaporozhets 1438285de1 Merge pull request #7601 from yglukhov/hide_pass 
Mask password in import URL while importing.
 2014-08-28 16:50:19 +03:00
Dmitriy Zaporozhets 22a7fcab8c Merge pull request #7620 from zzet/patch-11 
Add search in textarea
 2014-08-28 16:49:42 +03:00
Dmitriy Zaporozhets da55f2d9b0 Fix fork button for project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 16:46:06 +03:00
Dmitriy Zaporozhets 48f8c5a873 Improve project sidebutton colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 15:10:47 +03:00
Dmitriy Zaporozhets 8289308933 Restyle project home 
* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 14:19:11 +03:00
dreis 7b9a1819f7 Fix overflow in 'my projects' list 2014-08-28 10:54:21 +02:00
Andrew Kumanyaev f9c7f41476 Add missing ext for searchbox 2014-08-28 12:08:02 +04:00
Dmitriy Zaporozhets 1056d91c67 Improve search results output. Fixes some markup issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 11:06:19 +03:00
Dmitriy Zaporozhets 6f154c07c8 Prevent possible XSS issues by seting text/plain for all text files in 
RAW feature

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 10:42:52 +03:00
Andrew Kumanyaev 0534d75a84 Add search in textarea 
https://github.com/ajaxorg/ace/blob/master/lib/ace/commands/default_commands.js#L176-L181
 2014-08-28 11:40:05 +04:00
Dmitriy Zaporozhets c9054319c8 nicer block for oauth signin links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 18:21:54 +03:00
uran e9015dfbc9 Mask password in import URL while importing. 2014-08-27 18:04:18 +03:00