Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets de6f4c3135 Merge pull request #7596 from bbodenmiller/patch-5
add current sign-in date
2014-09-08 09:37:21 +03: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 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
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04: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 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
Robert Schilling bd2355191f Show labels help message if last label is deleted 2014-09-04 23:15:28 +02: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 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 5f6eb09cdf Improve issue filtering. Make tests pass
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-03 19:18:23 +03:00
Jan-Willem van der Meer 62fc80642d Refactor Oauth::User class to use instance methods 2014-09-03 15:59:50 +02: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
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
Charles Bushong b1411e90f8 Changing some formatting for the Hound, modifying some UI text 2014-09-02 08:33:23 -04: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
Daniel Loman b816491356 added str-truncated to branch list to fix issue #7192 2014-09-01 15:16:55 -07:00
Ciro Santilli 330251de91 Fix missing to on reassign MR email to unassigned.
Factors out MR and issue email.
2014-09-01 17:35:25 +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 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