home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,320 Commits 48 Branches 340 Tags
00ccaed029efbbdff96a4b64628a3a2d9bf5125d
Commit Graph
11320 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
jubianchiandjubianchi 4fdd21685c Filters issues by state via API 2014-09-01 13:51:40 +02:00
Jan-Willem van der Meer 6143cef4c4 Handle user creation if email is not provided 
This fixes #1541
 2014-09-01 13:49:16 +02: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 6dd140047f Merge branch 'search-issues-spinach' into 'master' 
Added Spinach tests for search issues by issue-description

Added Spinach tests for 'search issues by description' feature which was added to Changelog 7.1 for feature "Filter by description on Issues#index page"

See merge request !172
 2014-09-01 11:35:09 +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 a28fe934d6 Merge pull request #7628 from zzet/update_markdown 
Update redcarpet gem
 2014-09-01 14:01:19 +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
Dmitriy Zaporozhets 4198b58a8c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 12:19:17 +03:00
Jeroen van Baarsen 174c00cf2c Merge pull request #7428 from bbodenmiller/patch-2 
[Documentation] add prepare for update details to 5.1 to 6.0 guide
 2014-08-31 10:46:50 +02:00
Robert Schilling e78b2b9040 Merge branch 'double_quotes_empty_project' into 'master' 
Modify empty project instructions to use double quotes for commit mesage

Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/6006904-modify-instruction-to-use-double-quotes-for-windo

See merge request !179
 2014-08-31 07:41:38 +00:00
Ben Bodenmiller 44185ace11 add prepare for upgrade section 
helps detect and correct issues that may occur during upgrade before
they have already occurred. easier to address issues before you start
upgrade process.
 2014-08-30 17:04:45 -07: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
Dmitriy Zaporozhets 1d04a6fda7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-30 10:17:07 +03:00
Dmitriy Zaporozhets 14f5199cdc Merge branch 'feature-ldap-tests' into 'master' 
Feature ldap tests

Move specs to proper places. Relates to #154

This is already mergeable, will continue in a new branch for additions & refactorings.

See merge request !1053
 2014-08-30 07:16:45 +00:00
Dmitriy Zaporozhets cb71b26353 Merge branch 'ldap_allow_email' into 'master' 
Avoid ldap.allow_username_or_email_login issues

See merge request !1016
 2014-08-30 07:15:31 +00:00
Dmitriy Zaporozhets 0ef9ee18b1 Merge pull request #7639 from PeterDaveHello/patch-1 
make CI build faster
 2014-08-30 10:07:39 +03:00
Robert Schilling d7b66e60d2 Merge pull request #7642 from cirosantilli/patch-5 
Comment typo.
 2014-08-29 21:49:03 +02:00
Ciro Santilli af7b19003c Comment typo. 2014-08-29 20:11:57 +02:00
Robert Schilling 8a7d10af23 Merge pull request #7641 from cirosantilli/patch-4 
Comment typo.
 2014-08-29 20:08:51 +02:00
Ciro Santilli 5317c26cf7 Comment typo. 2014-08-29 19:35:04 +02:00
Robert Schilling 48d8f993c3 Merge pull request #7640 from PeterDaveHello/patch-2 
Use svg instead of png to get better image quality
 2014-08-29 18:52:49 +02:00