home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,206 Commits 48 Branches 340 Tags
be3a9440af7cedcf60dc1bb64c63f1786dc565bc
Commit Graph
3672 Commits
Author SHA1 Message Date
Douwe Maan a60e09d313 Merge branch 'rs-issue-14220' into 'master' 
Be more intelligent about sanitizing links with unsafe protocols

This prevents false matches on relative links like
`[database](database.md)`.

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

See merge request !3210
 2016-03-15 08:29:04 +00:00
Robert Speicher c4b35a6230 Merge branch 'fix-commit-status-rendering' into 'master' 
Cleanup Ci::Commit, Ci::Build and CommitStatus views

This MR tries to do first sweep of cleanups to Ci::Commit and
Ci::Build objects removing all view-related functions and fixing the
API from other side.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046

See merge request !2760
 2016-03-15 00:51:43 +00:00
Robert Speicher 41de7b345b Be more intelligent about sanitizing links with unsafe protocols 
This prevents false matches on relative links like
`[database](database.md)`.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220
 2016-03-14 18:05:01 -04:00
Douwe Maan ca3fc2296f Merge branch 'gitlab-ci-yaml-updates' into 'master' 
New CI YAML features

This introduces a couple of small `.gitlab-ci.yml` features:

1. Documentation for: Allow to use YAML anchors when parsing the `.gitlab-ci.yml`: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2958
2. Ignore jobs that start with `.`
3. Allow to pass name of created artifacts archive in `.gitlab-ci.yml`
4. Allow to define on which builds the current one depends on

These are really small changes so it makes not sense to create a separate merge requests for them.

@axil Could you review the documentation part?

The implementation on GitLab Runner side: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/113.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/13755 https://gitlab.com/gitlab-org/gitlab-ce/issues/14211 https://gitlab.com/gitlab-org/gitlab-ce/issues/3423

cc @grzesiek @axil @DouweM 


See merge request !3182
 2016-03-14 20:06:50 +00:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master' 
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

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

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
 2016-03-14 16:38:52 +00:00
Robert Speicher 1421fa962e Merge branch 'rs-snippet-expires-api' into 'master' 
Don't remove `ProjectSnippet#expires_at` from API

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103

This partially reverts commit 836d593033.

See merge request !3144
 2016-03-14 15:55:05 +00:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild 
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
 2016-03-14 13:20:35 +01:00
Dmitriy Zaporozhets e8b3b92dde Bring share project with group API from EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-13 11:52:43 +01:00
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" 
This reverts commit 5a586f364c
 2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' " 
This reverts merge request !3191
 2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master' 
Support Golang subpackage fetching

Closes #13805

See merge request !3191
 2016-03-12 17:38:08 +00:00
Achilleas Pipinellis 8c543e6010 Merge branch 'master' into gitlab-ci-yaml-updates 2016-03-12 19:27:28 +02:00
Stan Hu 380a67ad4c Ensure PATH_INFO exists for go-get 2016-03-12 08:10:54 -08:00
Stan Hu bb206f947f Simplify code 2016-03-12 07:50:02 -08:00
Douwe Maan ff62e20607 Merge branch 'fix-gh-pr-import' into 'master' 
Fix importing PR's from GitHub when the source repo was removed

Closes #13847 
Closes gitlab-com/support-forum#584

See merge request !3172
 2016-03-12 14:07:45 +00:00
Stan Hu cc065fbeaa Support Golang subpackage fetching 
Closes #13805
 2016-03-12 01:09:37 -08:00
Douwe Maan cb81c8a5ef Merge branch 'rs-issue-12944' into 'master' 
Use a custom Devise failure app to handle unauthenticated .zip requests

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

See merge request !2828
 2016-03-11 22:34:33 +00:00
Yorick PeterseandRobert Speicher b77b3b16b6 Removed order from sub-query projects for search 
There's no need to order queries used as sub-queries and doing so can
add potential overhead.
 2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher 8c2868e8ea Added ProjectSearchResults#project_ids_relation 
This ensures some other methods such as the "issues" method still work.
 2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher ec349dc1b6 Refactor Gitlab::ProjectSearchResults 
Previously this class would be given a project ID which was then used to
retrieve the corresponding Project object. However, in all cases the
Project object was already known as it was used to grab the ID to pass
to ProjectSearchResults. By just passing a Project instead we remove the
need for an extra query as well as the need for some other complexity
in this class.
 2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher 42fde69d39 Refactor Gitlab::SnippetSearchResults 
This removes the need for plucking snippet IDs into memory.
 2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher 013542965c Refactor Gitlab::SearchResults 
Instead of plucking IDs this class now uses ActiveRecord::Relation
objects. Plucking IDs is problematic as searching for projects can lead
to a huge amount of IDs being loaded into memory only to be used as an
argument for another query (instead of just using a sub-query).
 2016-03-11 15:25:22 -05:00
Douwe Maan 5a84e8381a Merge branch 'remove-benchmark-suite' into 'master' 
Removed benchmark suite and its documentation

Related issue: gitlab-org/gitlab-ce#13718

See merge request !3137
 2016-03-11 15:06:37 +00:00
Kamil Trzcinski 388f69b0de Merge remote-tracking branch 'origin/master' into gitlab-ci-yaml-updates 
# Conflicts:
#	spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
 2016-03-11 14:22:49 +01:00
Kamil Trzcinski 9a271d8012 Allow to define on which builds the current one depends on 2016-03-11 14:15:13 +01:00
Kamil Trzcinski d300ecf8d9 Allow to pass name of created artifacts archive in .gitlab-ci.yml 2016-03-11 13:43:57 +01:00
Kamil Trzcinski ad4d3a075f Describe special YAML features: the use of anchors and hidden jobs 2016-03-11 13:41:05 +01:00
Kamil Trzciński 1cdc355a0f Merge branch 'gitlab-ci-yaml-alias' into 'master' 
Support YAML alias/anchor usage in .gitlab-ci.yml

This allows to reuse one job as a template for another one:

```
job1: &JOBTMPL
  script: execute-script-for-job

job2: *JOBTMPL

```

This also helps to solve some of the issues in gitlab-org/gitlab-ci#342

See merge request !2958
 2016-03-11 12:04:32 +00:00
Douglas Barbosa Alexandre 37b00b16a5 Fix importing PR's from GitHub when the source repo was removed 2016-03-10 19:29:54 -03:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
Jacob Vosmaer 7b2bf4ce75 Typo 2016-03-10 18:41:57 +01:00
Jacob Vosmaer 261214efc2 Make comment less ambivalent 2016-03-10 18:39:50 +01:00
Jacob Vosmaer f4d478a6a8 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expiring-lock 2016-03-10 17:07:27 +01:00
Jacob Vosmaer 3729c0822a Remove unnecessary random key 2016-03-10 17:05:36 +01:00
Jacob Vosmaer 66d5d9229d Improve comment 2016-03-10 12:58:51 +01:00
Jacob Vosmaer e7df3f51c9 Move method to User 2016-03-10 12:37:14 +01:00
Yorick Peterse d69dff5b4b Removed benchmark suite and its documentation 
The rationale for this can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/13718 but in short the
benchmark suite no longer serves a good purpose now that we have proper
production monitoring in place.

Fixes gitlab-org/gitlab-ce#13718
 2016-03-10 11:15:43 +01:00
Jacob Vosmaer 0223b58f01 Explain LDAP "lock" behavior 2016-03-10 11:05:59 +01:00
Jacob Vosmaer cda0b7e1b1 Rename ExpiringLock to ExclusiveLease 2016-03-10 10:41:16 +01:00
Jacob Vosmaer 570f428b89 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into redis-config-parser 2016-03-10 09:45:38 +01:00
Robert Speicher befa7a9c17 Don't remove ProjectSnippet#expires_at from API 
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103

This partially reverts commit 836d593033.
 2016-03-09 16:56:42 -05:00
Dmitriy Zaporozhets fdfcc1ac0d Merge branch 'rs-sprite-task' into 'master' 
Add a `gemojione:sprite` Rake task

This task will generate a standard and Retina sprite of all of the
current Gemojione Emojis, with the accompanying SCSS map.

It will not appear in `rake -T` output, and the dependent gems are not
included in the Gemfile by default, because this task will only be
needed occasionally.

See merge request !3130
 2016-03-09 19:32:08 +00:00
Jacob Vosmaer acd9bc0213 Acquire lock before LDAP sync 2016-03-09 19:11:24 +01:00
Robert Speicher e443c7c6d8 Add a gemojione:sprite Rake task 
This task will generate a standard and Retina sprite of all of the
current Gemojione Emojis, with the accompanying SCSS map.

It will not appear in `rake -T` output, and the dependent gems are not
included in the Gemfile by default, because this task will only be
needed occasionally.

[ci skip]
 2016-03-09 12:44:48 -05:00
Jacob Vosmaer 3eb7ea49fe Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into redis-config-parser 2016-03-09 16:20:35 +01:00
Jacob Vosmaer a12319c111 Always with the newlines 2016-03-09 15:56:44 +01:00
Jacob Vosmaer c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00
Kamil Trzcinski af43401602 Retry spinach tests 2016-03-09 14:22:32 +01:00
Rémy Coutable 500337c4b2 Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master' 
Fix bug where Bitbucket 'closed' issues were imported as 'opened'

_Originally opened at !2930 by @iurisilvio._

- - -

Bitbucket has an undocumented status `closed`.

https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html

Related to https://gitlab.com/gitlab-com/support-forum/issues/559

See merge request !2973
 2016-03-09 12:54:52 +00:00
Dmitriy Zaporozhets bc14d81af0 Merge branch 'rs-snippets-dont-expire' into 'master' 
Remove `Snippet#expires_at`

This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.

See merge request !3103
 2016-03-09 09:02:17 +00:00