home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,260 Commits 48 Branches 340 Tags
dcdf0b2af2514f9f6778fd16cbcb77929a0bd708
Commit Graph
3195 Commits
Author SHA1 Message Date
Rémy Coutable e79b867d2b Ensure empty recipients are rejected in BuildsEmailService 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-06 16:14:51 +02:00
Douglas Barbosa Alexandre f2005fa566 Flush repository cache before import project data 
GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.
 2016-04-04 19:35:39 -03:00
Douwe Maan f505c753b0 Merge branch 'fix_remove_fork_link' into 'master' 
Remove fork link closes all merge requests opened on source project

Currently, if you:

- create a fork
- open a merge request on the source project
- remove the fork link

The created MR cannot be closed.

With this MR, all pending MR is closed when the fork link is removed.

See merge request !3189
 2016-04-04 15:37:08 +00:00
Douwe Maan ba7fcc9866 Merge branch 'update_repository_from_ee' into 'master' 
Migrate Repository#local_branches from gitlab-ee.

REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249

This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee

See merge request !3496
 2016-04-04 14:25:15 +00:00
Yorick Peterse 3dd91f55a0 Merge branch 'issue_14853' into 'master' 
Fix bug related to filtering Issues by Label/Milestone.

See merge request !3499
 2016-04-04 09:05:57 +00:00
Douwe Maan 136267dd35 Merge branch 'fix-bad-fetch' into 'master' 
Don't fetch any tags from a forked repo

Closes #13957

See merge request !3504
 2016-04-03 12:17:43 +00:00
Rubén Dávila fd090a2fab Fix bug related to filtering Issues by Label/Milestone. 
This problem only was affecting the dev env.
 2016-04-02 07:36:41 -05:00
Stan Hu b43e059748 Don't fetch any tags from a forked repo 
Closes #13957
 2016-04-02 00:45:07 -07:00
Rubén Dávila e6b5716785 Migrate Repository#local_branches from gitlab-ee. 
This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee
 2016-04-01 14:21:08 -05:00
Robert Speicher 5627542fd4 Merge branch 'routing' into 'master' 
Added & use Gitlab::Routing for URL helpers

Extracted from !3389

See merge request !3486
 2016-04-01 16:51:20 +00:00
Robert Speicher c8038dc243 Merge branch 'memoize-pattern-methods' into 'master' 
Memoize reference_pattern/link_reference_pattern

Extracted from !3389

See merge request !3485
 2016-04-01 16:49:50 +00:00
Rémy Coutable f9ab215b21 Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master' 
Allow temp-oauth-email as notification email

Closes #14559 

/cc @dblessing @rymai 

See merge request !3477
 2016-04-01 14:12:42 +00:00
Yorick Peterse 84b0ab7766 Added & use Gitlab::Routing for URL helpers 
Rails' "url_helpers" method creates an anonymous Module (which a bunch
of methods) on every call. By caching the output of this method in a
dedicated method we can shave off about 10 seconds of loading time for
an issue with around 200 comments.
 2016-04-01 11:13:48 +02:00
Yorick Peterse e7849b0b25 Memoize reference_pattern/link_reference_pattern 
These methods are called quite often in loops so by memoizing their
output we can reduce timings a bit.
 2016-04-01 11:13:30 +02:00
Douwe Maan 2e3c2a355f Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' 
Fix Error 500 when searching for a comment in a project snippet

Closes #14764. /cc @stanhu, and thank you for the spec! ;)

See merge request !3468
 2016-04-01 08:38:16 +00:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project. 
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
 2016-03-31 17:09:36 -06:00
Zeger-Jan van de Weg 1e7116b34d Exclude projects pending deletion from all results 2016-03-31 20:20:18 +02:00
Zeger-Jan van de Weg 2c6207135e Allow temp-oauth-email as notification email 2016-03-31 19:59:19 +02:00
Rémy Coutable 95c7aa62de Merge branch 'fix-todos' into 'master' 
Destroy related todos when an Issue/MR is deleted

Closes #14550 

Closes #14598

See merge request !3376
 2016-03-31 16:43:12 +00:00
Rémy Coutable 091b8a6ede Rename Note#for_project_snippet? to #for_snippet? 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-31 09:20:27 +02:00
Yorick Peterse 84764847f7 Merge branch 'reorder-project-expire-cache' into 'master' 
Expire the exists cache before deletion to ensure project dir actually exists

See merge request !3413
 2016-03-30 22:51:36 +00:00
Robert Speicher 3d4848615c Merge branch 'patch/fix-mergerequest-diff' into 'master' 
Fix Raw / Rendered diff producing different results on merge requests

The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`.

Fixes #14680, #3017

See merge request !3450
 2016-03-30 16:02:19 +00:00
Douglas Barbosa Alexandre 9b93f8adc8 Destroy related todos when an issue is deleted 2016-03-30 12:09:34 -03:00
Rémy Coutable 4a4398560c Merge branch 'added-milestone-upcoming' into 'master' 
Dropdown bug fixes

- Added back upcoming to milestone filter

![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png)

- Fixed bug that would cause the currently selected value to disappear on filters
- Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past

Closes #14536

See merge request !3368
 2016-03-30 06:49:04 +00:00
Gabriel Mazetto 11865ee267 We need sha reference from diff_base_commit to generate the diff 2016-03-29 23:59:51 -03:00
Gabriel Mazetto a9b2a2744c Use diff_base_commit instead of target_branch to generate diffs 2016-03-29 23:59:51 -03:00
Robert Speicher a9f5df384e Merge branch 'fix_wip_in_mr_api' into 'master' 
Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432
 2016-03-29 18:49:08 +00:00
Robert Speicher b1f924c165 Merge branch 'handle-nil-description-slack-message' into 'master' 
Handle nil descriptions in Slack issue messages

Closes #14676

See merge request !3420
 2016-03-29 16:30:55 +00:00
Phil Hughes b5ece0886a Ruby fixes 2016-03-29 12:19:09 +01:00
Phil Hughes 88024b17c0 Standardised the output of the JSON to always include the name 
The frontend will then always use the name as the ID - like previous
 2016-03-29 11:59:13 +01:00
Douwe Maan a7ca8689f7 Merge branch 'fix-14607' into 'master' 
Ensure private project snippets are not viewable by unauthorized people

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607

See merge request !1946
 2016-03-29 08:21:48 +00:00
Abhi Rao 762d6ab4fd Ensuring Merge Request API returns boolean values for work_in_progress 
Fixes #14692
 2016-03-28 22:11:44 -05:00
Stan Hu 2fa20f2d4f Handle nil descriptions in Slack issue messages 
Closes #14676
 2016-03-28 04:15:41 -07:00
Stan Hu 2e328c1ea7 Expire the exists cache before deletion to ensure project dir actually exists 
Closes #14659
 2016-03-27 08:52:44 -07:00
Stan Hu c1834664a7 Merge branch 'handle-avatar-in-empty-repo' into 'master' 
Don't attempt to look up an avatar in repo if repo directory does not exist

Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/

Closes #14580



See merge request !3390
 2016-03-27 00:21:57 +00:00
Dmitriy Zaporozhets ea8bd204e3 Merge branch 'feature--preferences-dashboard-groups' of https://gitlab.com/eliasw/gitlab-ce 2016-03-26 11:08:48 +01:00
Dmitriy Zaporozhets 2fdf928afa Merge branch 'ci-setup-info' into 'master' 
Add links to CI setup documentation from project settings and builds pages

For #14483 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3384
 2016-03-26 09:57:47 +00:00
Rémy Coutable 4f07c0a107 Ensure project snippets have their own access level 2016-03-25 18:51:17 +01:00
Dmitriy Zaporozhets 179bae9968 rescue Rugged::ReferenceError in Repository#gitlab_ci_yml method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 17:54:57 +01:00
Stan Hu 506878970b Don't attempt to look up an avatar in repo if repo directory does not exist 
Closes #14580
 2016-03-25 06:30:51 -07:00
Dmitriy Zaporozhets ed8e1faa4c Make sure Repository#gitlab_ci_yml is safe to use even when repository is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 14:19:20 +01:00
Rémy Coutable f4bdefdff1 Ensure private project snippets are not viewable by unauthorized people 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
 2016-03-25 12:33:42 +01:00
Elias Werberich c3a98d8fcc Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences. 
Fixes #14585.
 2016-03-24 19:59:54 +01:00
Douglas Barbosa Alexandre 39a51f9e1c Rename Event#proper? to Event#visible_to_user? 2016-03-24 14:24:22 -03:00
Douglas Barbosa Alexandre 239560331a Comments on confidential issues doesn't show in activity feed to non-members 2016-03-24 14:22:01 -03:00
Dmitriy Zaporozhets b105b84e3a Use head tree (cached) for file search. Also add some tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 15:38:16 +01:00
Dmitriy Zaporozhets 3b1543cd15 Detect build setup state based on gitlab_ci.yml presense 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 15:17:13 +01:00
Robert Speicher 0e85a8b816 Merge branch 'issue_14453' into 'master' 
Strip commit title when creating revert commit.

Fixes #14453 

See merge request !3352
 2016-03-23 16:46:23 +00:00
Douwe Maan b651a4fd41 Fix Milestone.upcoming 2016-03-23 15:09:58 +00:00
Lin Jen-Shin ecc060d701 Make sure we get only two returns 2016-03-23 20:22:09 +08:00