home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 12b35c6fe8 Merge branch 'flay' into 'master' 
Add flay: tool to find duplicate code

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

See merge request !1789
 2015-11-11 16:21:35 +00:00
Robert Speicher 0667f050f3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-11-11 11:04:03 -05:00
Robert Speicher d59a821181 Update CHANGELOG 
[ci skip]
 2015-11-11 11:02:52 -05:00
James Lopez fd1b5d6479 updated exception 2015-11-11 15:54:28 +00:00
James Lopez c6a0f109cd refactored code as projects only have one owner. Kept some refactoring in place (has_owners concern) 2015-11-11 15:42:27 +00:00
Dmitriy Zaporozhets 7bca4cabc2 Merge branch 'flog' into 'master' 
Add method complexity check to CI

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

See merge request !1783
 2015-11-11 15:29:19 +00:00
Dmitriy Zaporozhets 98c954ee81 Add flay: tool to find duplicate code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-11 16:29:00 +01:00
Yorick Peterse dfd8ae8a84 Merge branch 'recent-scope-ordering' into 'master' 
Change "recent" scopes to sort by "id"

These scopes can just sort by the "id" column in descending order to
achieve the same result. An added benefit is being able to perform a
backwards index scan (depending on the rest of the final query) instead
of having to actually sort data.

See merge request !1788
 2015-11-11 15:19:09 +00:00
Dmitriy Zaporozhets 6748dd2fd0 Allow flog failure for now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-11 15:30:23 +01:00
Yorick Peterse 7eb502c036 Change "recent" scopes to sort by "id" 
These scopes can just sort by the "id" column in descending order to
achieve the same result. An added benefit is being able to perform a
backwards index scan (depending on the rest of the final query) instead
of having to actually sort data.
 2015-11-11 15:17:12 +01:00
Dmitriy Zaporozhets fdad3842a6 Merge branch 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-back' into 'master' 
Prevent people from adding the link back.



See merge request !1938
 2015-11-11 13:41:12 +00:00
Dmitriy Zaporozhets 26fab9cb95 Fix typo in email comment: hone -> one 2015-11-11 13:40:47 +00:00
Kamil Trzciński fb5c3c7021 Merge branch 'artifacts' into 'master' 
Implement Build Artifacts

This implements #3028 

1. It stores artifacts in shared/artifacts,
1. It adds `artifacts` to `.gitlab-ci.yml`,
1. We use GitLab Workhorse to offload artifacts uploading,
1. To download artifacts it uses GitLab Workhorse X-Sendfile extension,
1. There's one "artifact" per-build. The new upload removes previous one and creates a new one,
1. Default max artifact size is set to 100MB - this can be changed in settings.

Missing things:
1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files,
1. Artifacts passing between builds.

GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5
GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46

Syntax:
```
artifacts:
  untracked: true # default: false
  paths: # default: empty
  - bin/files
```


See merge request !1584
 2015-11-11 12:44:37 +00:00
Zeger-Jan van de Weg e189666a6d Add CHANGELOG line to the right release 2015-11-11 13:31:42 +01:00
Zeger-Jan van de Weg 9f548dffc3 Merge branch 'master' into rake-tasks-git 2015-11-11 13:22:00 +01:00
Zeger-Jan van de Weg a3f64b53ec Set changelog item to right release 2015-11-11 13:09:23 +01:00
Zeger-Jan van de Weg 7e4a7d9ecc Merge branch 'master' into copying-file-seen-as-licence 2015-11-11 13:07:02 +01:00
Kamil Trzciński dfa0978906 Merge branch 'ci-build-name-in-notification-email' into 'master' 
Send build name and stage in CI notification e-mail



See merge request !1776
 2015-11-10 22:04:08 +00:00
Kamil Trzcinski 58074ab7da Allow to define cache in .gitlab-ci.yml 2015-11-10 23:01:11 +01:00
Kamil Trzcinski d70f1f35b1 Fix tests 2015-11-10 23:00:05 +01:00
Andy Brandt 73f8763e6a fix build link 2015-11-10 15:42:17 -06:00
Drew Blessing 752d528019 Fix trailing space issue with merge requests and issues. Fixes #2514 2015-11-10 15:41:49 -06:00
Stan Hu 83ec84946c Merge branch 'add-allow-failure-status' into 'master' 
Add allow_failure field to commit status API

Closes #3196

See merge request !1685
 2015-11-10 21:28:12 +00:00
Kamil Trzcinski eef129bd4a Final fixes 2015-11-10 22:21:15 +01:00
Robert Speicher ca25289b78 Update CHANGELOG 
[ci skip]
 2015-11-10 15:44:23 -05:00
Robert Speicher ad5412b8f3 Merge pull request #9818 from mavimo/patch-6 
Fix duplicate entry for 8.1.0 release
 2015-11-10 15:43:20 -05:00
Achilleas Pipinellis 88836e2ab6 Fix bottom position of scroll buttons in build log page 2015-11-10 22:31:16 +02:00
Stan Hu abec87f4ac Merge branch 'fix-drone-ci-template-save' into 'master' 
Fix Drone CI service template not saving properly

This fixes an Error 500 when attempting to save a Drone CI template in the service template page. `hook.url` was not being used and depended upon a project when none existed.

/cc: @bugagazavr

Closes #3419

See merge request !1774
 2015-11-10 19:49:46 +00:00
Stan Hu 5aa142212f Fix Drone CI service template not saving properly 
Closes #3419
 2015-11-10 10:52:45 -08:00
Stan Hu 9738097722 Fix avatars not showing in Atom feeds and project issues when Gravatar disabled 
Fix for https://github.com/gitlabhq/gitlabhq/pull/9783
 2015-11-10 10:52:18 -08:00
Robert Speicher f162ed7aeb Merge branch 'rs-remove-text-rendering' into 'master' 
Remove text-rendering property

Continues !1779

Closes #3220

[ci skip]

See merge request !1784
 2015-11-10 18:32:46 +00:00
Robert Speicher afcced01e5 Remove text-rendering property 
Closes #3220

[ci skip]
 2015-11-10 13:15:18 -05:00
Dmitriy Zaporozhets 9b5d275320 Merge branch 'improve-ci-graphs' 2015-11-10 18:52:50 +01:00
Dmitriy Zaporozhets 8ecc6f94cb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-10 18:43:33 +01:00
Dmitriy Zaporozhets 58429d9b26 Add method complexity check to CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-10 18:34:05 +01:00
Dmitriy Zaporozhets 316dd9c8d6 Merge pull request #9819 from huacnlee/do-not-use-coffeescript-in-view 
Replace CoffeeScript block into JavaScript in Views.
 2015-11-10 18:33:11 +01:00
Robert Speicher 20b0ad2b0f Merge branch 'fix-tabs-not-rendering-in-chromium-45' into 'master' 
Remove CSS property preventing hard tabs from rendering in Chromium 45

This is to workaround a bug in Chromium 45 (https://code.google.com/p/chromium/issues/detail?id=446434),
which is the default browser in Ubuntu 14.04 and older.

Closes #3220

See merge request !1779
 2015-11-10 17:12:44 +00:00
Stan Hu 7199e9ef1d Merge branch 'fix-dup-changelog' into 'master' 
Remove duplicate CHANGELOG etnries

[ci skip]

See merge request !1782
 2015-11-10 16:18:22 +00:00
Stan Hu b0452f26c0 Remove duplicate CHANGELOG etnries 
[ci skip]
 2015-11-10 08:16:52 -08:00
Dmitriy Zaporozhets 463fc52fa8 Merge branch 'bump-rugged-version' into 'master' 
Bump rugged version to be in line with gitlab_git requirements



See merge request !1780
 2015-11-10 16:01:00 +00:00
Stan Hu ffa8d84a6e Bump charlock_holmes version 2015-11-10 07:56:05 -08:00
Stan Hu 78966d4ca6 Bump rugged version to be in line with gitlab_git requirements 2015-11-10 07:36:10 -08:00
Dmitriy Zaporozhets 802b8fceb4 Fix graph description and text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-10 16:27:50 +01:00
Stan Hu 99c05363ea Remove CSS property preventing hard tabs from rendering in Chromium 45 
This is to workaround a bug in Chromium 45 (https://code.google.com/p/chromium/issues/detail?id=446434),
which is the default browser in Ubuntu 14.04 and older.

Closes #3220
 2015-11-10 07:19:31 -08:00
Dmitriy Zaporozhets 7181fdd23e Merge branch 'issue_3072_target_name' into 'master' 
Display target branch on MR list when it is different from project's default

Fixes #3072

The screenshot below shows both previous and current UI state:

![branch-mr-both](/uploads/5c1f0519e42bae4655f3eee37edfc356/branch-mr-both.png)

First merge request has default branch as a target, second one has non default branch as target.

See merge request !1741
 2015-11-10 12:28:45 +00:00
Dmitriy Zaporozhets 8972aef558 Merge branch 'state-machine-to-state-machines-activerecord' into 'master' 
Switch to state_machines-activerecord (Fixes: #3374)

state_machine is unmaintained

See merge request !1764
 2015-11-10 12:20:59 +00:00
Kamil Trzcinski db3213fc1c Use normal file upload mechanism to upload artifacts 2015-11-10 12:51:51 +01:00
Kamil Trzcinski 7e4e3fb3b6 Fix nginx config to use @gitlab-workhorse 2015-11-10 12:51:51 +01:00
Kamil Trzcinski 445cdb7579 Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse now 2015-11-10 12:51:51 +01:00
Kamil Trzcinski 97f58bae87 Change artifacts syntax to allow uploading untracked files 2015-11-10 12:51:50 +01:00