Commit Graph
19901 Commits
Author SHA1 Message Date
Robert Speicher 4d7216aa3c Update CHANGELOG
[ci skip]
2015-11-11 10:59:41 -05:00
Robert Speicher 295b1f06b7 Version 8.1.4 v8.1.4 2015-11-10 23:12:14 -05:00
Robert Speicher 0350a36f28 Revert "Merge branch 'accept_mr_btn_ci_status' into 'master'"
This reverts commit aab713c121.
2015-11-10 16:05:00 -05:00
Robert SpeicherandRobert Speicher e16b80ddf6 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 13:34:11 -05:00
Robert SpeicherandRobert Speicher a25d68111e 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 12:16:28 -05:00
Dmitriy ZaporozhetsandRobert Speicher aab713c121 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-10 12:15:02 -05:00
Robert SpeicherandRobert Speicher 8fab83772e Merge branch 'fix-incoming-email-default' into 'master'
Fix incoming email config defaults

Fixes #3377.

See merge request !1766
2015-11-09 14:32:01 -05:00
Robert Speicher 3436ce0dd6 Update CHANGELOG
[ci skip]
2015-11-09 13:26:53 -05:00
Robert Speicher ad75d7fe78 Update CHANGELOG
[ci skip]
2015-11-09 12:28:24 -05:00
Douwe MaanandRobert Speicher fb3c685fdd Merge branch 'fix-commits-manual-merge' into 'master'
Fix bug where manually merged branches in a MR would end up with an empty diff

This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens:

1. User create a new branch `foo`.
2. User creates a merge request for `foo`.
3. User merges `foo` into `master` by hand.
4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff.
5. `RefreshService` then closes the MR.

This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.

Closes #3314

See merge request !1758
2015-11-09 12:26:54 -05:00
Stan HuandRobert Speicher a76d4d272e Merge branch 'fix-infinite-redirect' into 'master'
Only redirect to homepage url when its not the root url

It was possible to create an infi redirect when the user set up the
`home_page_url` to redirect to the main URL of the gitlab instance.

This fix makes sure this redirect is not possible.

Fixes #1020 

/cc @dblessing 

See merge request !1703
2015-11-09 12:17:18 -05:00
Robert Speicher 52f9e27a93 Version 8.1.3 v8.1.3 2015-11-05 22:37:11 -05:00
Robert SpeicherandRobert Speicher e6e4aa04dc Merge branch 'facebook-auth' into 'master'
Add Facebook authentication

See merge request !1740
2015-11-04 10:40:52 -05:00
Robert Speicher 22e0270848 Update CHANGELOG for 8.1.3
[ci skip]
2015-11-04 10:38:32 -05:00
Douwe MaanandRobert Speicher 0eb0a6090f Use issue editor as cross reference comment author when issue is edited with a new mention. 2015-11-04 10:36:06 -05:00
Robert SpeicherandRobert Speicher 52994bb915 Merge branch 'spread-runner-last-updated-at' into 'master'
Spread out runner contacted_at updates

This is meant to prevent having too many concurrent UPDATE requests
caused by runners checking in.

See merge request !1722
2015-11-04 10:34:36 -05:00
Douwe MaanandRobert Speicher 38039e3ace Merge branch 'fix-issue-3138' into 'master'
Force update refs/merge-requests/X/head upon a push to the source branch of a merge request

If a user rebases and does a force push, GitLab would not update the `refs/merge-requests/X/head` link. Using the -f flag forces this to happen.

Closes #3138

See merge request !1683
2015-10-31 13:02:23 +01:00
Robert Speicher 8c8af7b661 Version 8.1.2 v8.1.2 2015-10-27 13:05:40 +01:00
Robert Speicher 26e947c1d9 Update CHANGELOG for 8.1.2
[ci skip]
2015-10-27 12:52:12 +01:00
Robert SpeicherandRobert Speicher 927134def2 Merge branch 'add-project-path-index' into 'master'
Add projects path index

Fixes performance regression introduced by !1649

See merge request !1692
2015-10-27 12:42:40 +01:00
Robert Speicher babf1316a9 Version 8.1.1 v8.1.1 2015-10-26 15:53:15 +01:00
Robert SpeicherandRobert Speicher 5c2892bf35 Merge branch 'fix-ci-badge' into 'master'
Fix CI badge

The previous code relied on having on ref stored in commit, however the ref was moved to the build.

Fixes #3104

See merge request !1690
2015-10-26 15:04:27 +01:00
Robert Speicher bdfd23ee90 Update CHANGELOG
[ci skip]
2015-10-26 14:15:24 +01:00
Robert SpeicherandRobert Speicher 49ac908142 Merge branch 'fix-specific-runner-visibility' into 'master'
Fix visibility of specific runners

See merge request !1688
2015-10-26 13:54:04 +01:00
Robert Speicher 4b40dae385 Update CHANGELOG
[ci skip]
2015-10-26 11:42:32 +01:00
Robert SpeicherandRobert Speicher eea8a6d062 Merge branch 'remove-satellites' into 'master'
Add migration to remove the contents of the satellites dir

See merge request !1681
2015-10-26 11:41:10 +01:00
Stan HuandRobert Speicher 21854582ed Merge pull request #9749 from Bufallo/fix-redis-check
Fix regex in redis version check
2015-10-26 09:34:36 +01:00
Robert Speicher b539128400 Remove "install schedules" step from Installation guide
[ci skip]
2015-10-24 15:53:24 +02:00
Kamil Trzcinski 4467c425bc Merge branch 'fix-ci-regressions' into 8-1-stable 2015-10-23 16:26:53 +02:00
Kamil Trzcinski 940a7fc106 Fail builds that also have empty string 2015-10-23 16:25:23 +02:00
Kamil Trzcinski e0eb51e945 Fix broken Runners admin page 2015-10-23 16:25:23 +02:00
Kamil Trzcinski 74c02827bc On CI Admin page show only projects that are present in GitLab 2015-10-23 16:25:23 +02:00
Kamil Trzcinski 6b7d01d9ff Allow developer to manage builds 2015-10-23 16:25:22 +02:00
Kamil Trzcinski f855755999 Fix small CI UI regressions 2015-10-23 16:25:21 +02:00
Robert SpeicherandRobert Speicher 7121834535 Merge branch 'fix-wiki-clone-over-http' into 'master'
Fix cloning Wiki repositories via HTTP

Cloning a project Wiki over HTTP would end up cloning the main repository
since the .wiki extension was being stripped.

Closes #3106

See merge request !1676
2015-10-23 13:32:48 +02:00
Robert Speicher 6721215fa9 Merge branch '8-1-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-1-stable 2015-10-22 17:53:17 +02:00
Robert Speicher e913ab737c Merge branch 'fix-edit-readme' into '8-1-stable'
Fix edit readme link on project home page

See merge request !1668
2015-10-22 15:51:41 +00:00
Dmitriy Zaporozhets 6b9b829849 Fix edit readme link on project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-22 16:28:46 +02:00
Robert SpeicherandRobert Speicher 8fe4352eba Merge branch 'project-path-case-sensitivity' into 'master'
Prefer project with exact path to differently cased one when both exist.

Fixes #3113.

See merge request !1649
2015-10-22 15:05:54 +02:00
Robert SpeicherandRobert Speicher 613f368ce5 Merge branch 'fix-ci-services-editing' into 'master'
Fix 500 when editing CI services

Fixes #3090

See merge request !1663
2015-10-22 14:04:30 +02:00
Robert SpeicherandRobert Speicher 00244a8969 Merge branch 'fail-on-empty-job-name' into 'master'
Require jobs to be named

This properly presents error for .gitlab-ci.yml having empty job name.

See merge request !1662
2015-10-22 14:00:05 +02:00
Robert SpeicherandRobert Speicher 60e82ef857 Merge branch 'fix-css-for-runner' into 'master'
Fix CSS class for runner status

Fixes #3117 

See merge request !1665
2015-10-22 13:44:56 +02:00
Robert Speicher d8a9acdeee Version 8.1.0 v8.1.0 2015-10-22 10:00:53 +02:00
Robert Speicher 1019780555 Update CHANGELOG
[ci skip]
2015-10-22 09:56:06 +02:00
Valery SizovandRobert Speicher 6a81e51cb6 Merge branch 'fix-issue-3094' into 'master'
Don't show "Add README" link in an empty repository if user doesn't have access to push

Reporter users would see this before even though they didn't have access to push:

![image](/uploads/1dd328ab7e58cd00c5b696f079816e16/image.png)

It's not complete accurate to include the push command-line instructions, but users may still want the instructions to clone. After:

![image](/uploads/3d214e140916d2f174d0b5fec0ac472d/image.png)

Closes #3094

See merge request !1626
2015-10-22 09:22:32 +02:00
Robert SpeicherandRobert Speicher 843070b4aa Merge branch 'dm-issue-3140' into 'master'
Make sure MR refresh service correctly determines newly added commits.

Fixes #3140.

See merge request !1659
2015-10-22 09:16:28 +02:00
Robert SpeicherandRobert Speicher 357e07647f Merge branch 'fix-build-trace-updating' into 'master'
Fix build trace updating

Fixes #2910 

See merge request !1657
2015-10-22 09:10:28 +02:00
Robert SpeicherandRobert Speicher 8e65f91e67 Merge branch 'remove-ci-migration' into 'master'
Remove CI migration

See merge request !1656
2015-10-22 08:53:39 +02:00
Robert Speicher 62f6e8427d Version 8.1.0.rc2 v8.1.0.rc2 2015-10-21 11:15:34 +02:00
Dmitriy ZaporozhetsandRobert Speicher 3fc772615e Merge branch 'animated-logo' into 'master'
Animate the logo on hover

The logo is now rendered as pure SVG, rather than image referencing a
svg. The SVG has an id and the shapes of the logo have a shared class.
The shapes change their fill color on hover with a transition.

Identical to how it looks on about.gitlab.com

cc @skyruler

See merge request !1557
2015-10-21 10:32:20 +02:00