Commit Graph
20380 Commits
Author SHA1 Message Date
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
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
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
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 d70f1f35b1 Fix tests 2015-11-10 23:00:05 +01: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
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
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 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
Kamil Trzcinski d0e3e823a2 Implement Build Artifacts
- Offloads uploading to GitLab Workhorse
- Use /authorize request for fast uploading
- Added backup recipes for artifacts
- Support download acceleration using X-Sendfile
2015-11-10 12:51:50 +01:00
Jason Lee 18cb430f79 Replace CoffeeScript block into JavaScript in Views.
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
2015-11-10 19:17:37 +08:00
Kamil Trzcinski e8d97eb118 Send build name and stage in CI notification e-mail 2015-11-10 12:01:51 +01:00
Dmitriy Zaporozhets b1a1cadcc2 Add changelog item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 11:51:58 +01:00
Dmitriy Zaporozhets 1b7a2fc536 Improve Continuous Integration graphs page
* fix commit duration graph
* make graphs responsive
* fix wrong padding
* add a bit of explanation to colors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 11:49:38 +01:00
Marco Vito Moscaritolo f3bf0fe7ac Fix duplicate entry for 8.1.0 release
Fix duplicate entry for 8.1.0 release and remove unreleased tag.
2015-11-10 11:25:28 +01:00
Dmitriy Zaporozhets 354b69dde2 Merge remote-tracking branch 'origin/release-notes'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 10:20:22 +01:00
Anton Baklanov 746e49fee9 Display target branch on MR list when it is different from project's default 2015-11-10 09:31:14 +02:00
Achilleas Pipinellis 2ee3f8381b Merge branch 'master' into 'master'
Change documentation of converting a MySQL-Database to a Postgres one

The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904

closes #2904

See merge request !1549
2015-11-10 01:52:53 +00:00
Douwe Maan 264dc3f7dd Merge branch 'stanhu/gitlab-ce-bump-gitlab-git-and-other-gems' 2015-11-09 20:27:04 +01:00
Robert Speicher 9822bce467 Update monthly release issue template
[ci skip]
2015-11-09 14:24:26 -05:00
Robert Speicher f526d43432 Update CHANGELOG
[ci skip]
2015-11-09 13:26:29 -05:00
Dmitriy Zaporozhets 4ec51b34d7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-09 18:39:21 +01:00
Robert Speicher b740bfc218 Merge branch 'fix-incoming-email-default' into 'master'
Fix incoming email config defaults

Fixes #3377.

See merge request !1766
2015-11-09 17:25:31 +00:00
Stan Hu 4017a4fcbc Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3.
Switch back to github-linguist
2015-11-09 08:17:17 -08:00
Dmitriy Zaporozhets 62769e2050 Merge branch 'accept_mr_btn_ci_status' into 'master'
Merge button has color from CI status

This MR closes #3313

I'am not realy sure about the color for the skipped status (red)...

UI changes:

![accpet-mr-ci-failed](/uploads/c03970c468b89e38ed2c5e3171f53505/accpet-mr-ci-failed.png)

![accpet-mr-ci-skipped](/uploads/f29cbc69e77cc95b33522135b327cc51/accpet-mr-ci-skipped.png)

![accpet-mr-ci-pending](/uploads/79612a66fd497174e00bd348c9cba69c/accpet-mr-ci-pending.png)

![accpet-mr-ci-success](/uploads/4b601e6d02b860db5ff53c47c98f3206/accpet-mr-ci-success.png)


See merge request !1761
2015-11-09 15:54:28 +00:00
Yorick Peterse 73cf0f1647 Only load rblineprof when actually needed
This ensures the application can still boot when the "development" group
is not available.
2015-11-09 15:54:13 +01:00
Dmitriy Zaporozhets b7619dad52 Add missing param and title for tag
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-09 15:39:18 +01:00
Dmitriy Zaporozhets b67fdfff3c Refactor release code a bit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-09 15:30:50 +01:00
Pirate Praveen ddd3dd72fe update Gemfile.lock 2015-11-09 09:11:42 -05:00