Commits · 4bd00e5378736231225394f80b87b7f89077cb76 · nexedi / gitlab-ce

03 Dec, 2018 1 commit

Squashed commit of the following: · 4bd00e53

Shinya Maeda authored Dec 03, 2018

commit 04b06a2293fa12660a9c213a9db27fe90b83248b
Merge: d580841d4ed a445aa0a
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Mon Dec 3 10:51:55 2018 +0900

    Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status

commit d580841d4ed944f01e6417fa77842826843b6a04
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Nov 30 18:11:04 2018 +0900

    Add environment to all_models.yml

commit 689fbe2699a3adf10804312e680fa336e4560eaf
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Nov 30 17:00:35 2018 +0900

    Proper way to get uniq relationship

commit c0733c6ecd535a6a1b6243080a2226836890f479
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Nov 30 16:20:40 2018 +0900

    Revert build change

commit 19dc55a8fe6e0fa575858d51144516b7fb0120de
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Nov 30 16:19:18 2018 +0900

    Add uniq option

commit 0a6995f311c09b453fd0aecff2f6052de38efc27
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Nov 30 16:14:30 2018 +0900

    Drop persisted_environment

commit 3f68fc783b0ee0d66e03de6d979616c4c4892118
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Nov 28 13:59:04 2018 +0900

    Return empty array if pipeline is nil

commit 73801c5c3d06339e38dce7461a71285bcdbb8f45
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Nov 27 16:34:47 2018 +0900

    Add changelog

commit d461699abf2835cc51949a5138e829628209dd6d
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Nov 27 16:32:20 2018 +0900

    Squashed commit of the following:

    commit 77ab5259605e217a39b04d2cea6204277e42d2b5
    Merge: 7ac1ed50612 2ee8c40f
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 27 16:31:07 2018 +0900

        Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status

    commit 7ac1ed50612620df6408220b0a7cfcb626a04c48
    Merge: 49ba5c5aeff b55aeca2
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Mon Nov 26 20:01:43 2018 +0900

        Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status

    commit 49ba5c5aeff3efee7b7498d443372021c3f4f8b5
    Merge: aa3fd0ff9e8 fbbe5ccd
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Mon Nov 26 15:27:36 2018 +0900

        Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status

    commit aa3fd0ff9e8a418a233ebaa60b38c081cab50099
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 20 18:28:53 2018 +0900

        Fix static analysis

    commit 7afe5f37003869a73dbb297229f8533f78b82684
    Merge: e65b9580ff4 8a581d53
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 20 18:27:33 2018 +0900

        Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status

    commit e65b9580ff422359113e1a4e37c212f7b13aba4d
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Mon Nov 19 17:59:48 2018 +0900

        Ignore deployments from project import/export

    commit 9eb4ddab8415c1ef61a3c646bdc4602bcf4ebe24
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Mon Nov 19 16:26:00 2018 +0900

        Add memoization

    commit 57f0bea3aaaa07b75d18e52068c532277350cda0
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Mon Nov 19 16:21:39 2018 +0900

        Fix unrelated deployment status in MR widget

4bd00e53

30 Nov, 2018 33 commits

Merge branch 'workhorse-7-3-0' into 'master' · a445aa0a
Stan Hu authored Nov 30, 2018
```
Upgrade GitLab Workhorse to v7.3.0

See merge request gitlab-org/gitlab-ce!23489
```
a445aa0a

Merge branch 'rs-fix-todo-spec' into 'master' · aed3ec69

Stan Hu authored Nov 30, 2018

Add additional scope check to Todo#for_target spec

See merge request gitlab-org/gitlab-ce!23487

aed3ec69

Upgrade GitLab Workhorse to v7.3.0 · 457cabbf
Nick Thomas authored Nov 30, 2018

457cabbf

Add additional scope check to Todo#for_target spec · 51e63a79

Robert Speicher authored Nov 30, 2018

This works around a condition where the Issue and the MergeRequest
created by FactoryBoth both had the same ID, which caused `for_target`
to return two records when we only expected one.

51e63a79

Merge branch 'docs-gitaly-debug' into 'master' · c8fa8da2
Achilleas Pipinellis authored Nov 30, 2018
```
Add documentation reference to gitaly-debug

See merge request gitlab-org/gitlab-ce!23386
```
c8fa8da2
Add documentation reference to gitaly-debug · 77750e1b
Jacob Vosmaer authored Nov 30, 2018

77750e1b
Merge branch '6861-group-level-project-templates-ce' into 'master' · 5f1b71d1
Phil Hughes authored Nov 30, 2018
```
Backport from gitlab-org/gitlab-ee!6878

See merge request gitlab-org/gitlab-ce!23391
```
5f1b71d1
Merge branch 'if-52811-fix_namespaces_api_routing' into 'master' · 93d6f569
Nick Thomas authored Nov 30, 2018
```
Fix API::Namespaces routing to accept namepaces with dots

See merge request gitlab-org/gitlab-ce!22912
```
93d6f569
Merge branch 'patch-33' into 'master' · 55447c09
Robert Speicher authored Nov 30, 2018
```
Fix Red/Orange data link markdown

See merge request gitlab-org/gitlab-ce!23461
```
55447c09
Fix Red/Orange data link markdown · bc3e68d5
Philippe Lafoucrière authored Nov 30, 2018

bc3e68d5
Clarify support of subgroups as project template source · fa7acd99
Dennis Tang authored Nov 30, 2018

fa7acd99
Merge branch '51029-status-emoji-currently-replaces-avatar-on-mobile' into 'master' · d962e17a
Filipa Lacerda authored Nov 30, 2018
```
Resolve "Status Emoji currently replaces avatar on mobile"

Closes #51029

See merge request gitlab-org/gitlab-ce!23408
```
d962e17a
Merge branch 'docs/remove-link-and-fix-page' into 'master' · 4a3ec67b
Achilleas Pipinellis authored Nov 30, 2018
```
Remove broken link and fix markdown formatting

See merge request gitlab-org/gitlab-ce!23467
```
4a3ec67b
Merge branch 'if-40385_fix_doc' into 'master' · 8909cf40
Achilleas Pipinellis authored Nov 30, 2018
```
Improve wording on disabling impersonation in api/README

See merge request gitlab-org/gitlab-ce!23472
```
8909cf40
Update doc/user/group/index.md · 6d8f8bc1
Dennis Tang authored Nov 30, 2018

6d8f8bc1
Merge branch 'gt-externalize-app-views-invites' into 'master' · 24790d3b
Kushal Pandya authored Nov 30, 2018
```
Externalize strings from `/app/views/invites`

See merge request gitlab-org/gitlab-ce!23205
```
24790d3b
Add docs for custom project templates · b0998fc6
Dennis Tang authored Nov 30, 2018

b0998fc6
Merge branch '53778-post-deployment-fix' into 'master' · 75734c46
Yorick Peterse authored Nov 30, 2018
```
Move drop_site_statistics to be a post deployment migration

See merge request gitlab-org/gitlab-ce!23455
```
75734c46
Merge branch 'smooshpack-upgrade' into 'master' · 9a20061d
Filipa Lacerda authored Nov 30, 2018
```
Upgraded Codesandbox packages

Closes #51210

See merge request gitlab-org/gitlab-ce!23475
```
9a20061d

Merge branch 'generalize-ci-config' into 'master' · bd45beaf

Grzegorz Bizon authored Nov 30, 2018

ci/config: generalize Config validation into Gitlab::Config:: module

See merge request gitlab-org/gitlab-ce!23443

bd45beaf

Upgraded Codesandbox packages · ec8b81d5
Phil Hughes authored Nov 30, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51210
```
ec8b81d5
Merge branch 'bw-fix-silence-stderr-typo' into 'master' · 4e85011f
Sean McGivern authored Nov 30, 2018
```
Fix typo in method name "silence_stderr"

See merge request gitlab-org/gitlab-ce!23468
```
4e85011f

Merge branch 'ignore-failed-pipeline-creation-on-pipeline-schedule' into 'master' · 817bb190

Kamil Trzciński authored Nov 30, 2018

Remove auto deactivation when failed to create a pipeline via pipeline schedules

Closes #41231

See merge request gitlab-org/gitlab-ce!22243

817bb190

Merge branch '54218-fix-mergeUrlParams' into 'master' · 9f967ba2

Phil Hughes authored Nov 30, 2018

Resolve "mergeUrlParams wrong with fragment url"

Closes #54218

See merge request gitlab-org/gitlab-ce!23193

9f967ba2

Resolve "mergeUrlParams wrong with fragment url" · fe76827f
Thomas Holder authored Nov 30, 2018

fe76827f
Merge branch 'winh-timeline-entry-component' into 'master' · b6e70c8a
Kushal Pandya authored Nov 30, 2018
```
Extract shared timeline entry component

See merge request gitlab-org/gitlab-ce!23447
```
b6e70c8a
Merge branch '48496-merge-request-refactor-does-not-highlight-selected-line' into 'master' · df027849
Phil Hughes authored Nov 30, 2018
```
Resolve "Merge request refactor does not highlight selected line"

Closes #48496

See merge request gitlab-org/gitlab-ce!23121
```
df027849
Resolve "Merge request refactor does not highlight selected line" · 44a0121a
Sam Bigelow authored Nov 30, 2018

44a0121a
Improve wording on disabling impersonation in api/README · 9c4c9446
Imre Farkas authored Nov 30, 2018

9c4c9446

Merge branch 'fix-wrong-grape-version-requirement' into 'master' · 0d5cbd16

Stan Hu authored Nov 30, 2018

Currently a dependency for grape `~> 1.1` is defined but gitlab does not work…

See merge request gitlab-org/gitlab-ce!23451

0d5cbd16

Squashed commit of the following: · d56d419a

Shinya Maeda authored Nov 30, 2018

commit 0c00e52d339f8471a6ea425d5a4a59751a3f4a35
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Nov 30 15:41:46 2018 +0900

    Update schedules.md

commit 0ae56bf5a0ba9254d2ebd4c846395113ae72d686
Merge: c143777c9f2 9ce28bf0
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Nov 30 15:38:01 2018 +0900

    Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule

commit c143777c9f250c8075355ac07e9bae7b074665c3
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Nov 29 17:18:07 2018 +0900

    Fix coding offence

commit 7c816dfa634b5911310c67c285fc3c37d5f03517
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Nov 29 16:12:06 2018 +0900

    Improve spec quality

commit f78eed45e991123f8af4a7b24f041529bbb35e91
Merge: 96d20ce9144 a5f46278
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Nov 29 15:20:16 2018 +0900

    Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule

commit 96d20ce914458f86e68b57bc1bb88ab8d27f010b
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Nov 27 16:25:42 2018 +0900

    Print pipeline error

commit 97842068b6cf1432cd400ead749843946b4f51ee
Merge: c2b015949af 2ee8c40f
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Nov 27 15:51:49 2018 +0900

    Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule

commit c2b015949afb3ecc70cb057e2d13672f378c0d03
Merge: 3435137c17b fbbe5ccd
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Mon Nov 26 15:26:17 2018 +0900

    Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule

commit 3435137c17b0ef03003e39dd08c7370fe916c626
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Nov 20 17:45:38 2018 +0900

    Track exception with Sentry

commit 3f01f10d3b7380f0e8ceb3a379d8b6c602e9d6ca
Merge: 5749c62355f 8a581d53
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Nov 20 17:12:41 2018 +0900

    Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule

commit 5749c62355f8de62bb4e36ba1e351a78350607c1
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Nov 1 11:14:26 2018 +0900

    Create a pipeline even if it is corrupted

commit e01789890b6949b346d40fadef41aa133191cc43
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Oct 31 14:26:09 2018 +0900

    Improve production log message

commit f20d698a535f1dc70d5437c20b629fd1d956fb27
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Oct 19 17:11:20 2018 +0900

    Fix typo

commit 01323b02ac41ec50bcf237409f2e3c5c214bbfc1
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Oct 18 14:46:44 2018 +0900

    Update documents

commit 460337bf4a7e67a35d6c342678b4cfe66710ad56
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Oct 10 13:21:26 2018 +0900

    Add changelog

commit a3c4711752fedebfacbdf52da94058524af3c9f4
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Oct 10 09:20:06 2018 +0900

    Ignore failed pipeline creation in pipeline schedule worker. Instead, logging the event.

d56d419a

Manually edited the Gemfile.lock to make the gitlab-ce pipeline happy. · 3cf07b6e
Matthias Fechner authored Nov 30, 2018

3cf07b6e
Fix typo in method name "silence_stderr" · 4c7b7924
Brett Walker authored Nov 29, 2018

4c7b7924

29 Nov, 2018 6 commits
- Merge branch '50264-add-border-around-the-repository-file-tree' into 'master' · 9ce28bf0
  Clement Ho authored Nov 29, 2018
```
Resolve "Add border around the repository file tree"

Closes #50264

See merge request gitlab-org/gitlab-ce!23018
```
  9ce28bf0
- Resolve "Add border around the repository file tree" · 0bce564a
  Brandon Labuschagne authored Nov 29, 2018
  
  0bce564a
- Remove broken link and fix markdown formatting · 141d3eb9
  Evan Read authored Nov 30, 2018
  
  141d3eb9
- Merge branch 'docs-document-add-existing-cluster-admin' into 'master' · fc0258ae
  Evan Read authored Nov 29, 2018
```
Document how to create service account with admin

Closes #50005

See merge request gitlab-org/gitlab-ce!23362
```
  fc0258ae
- Document how to create service account with admin · cbfd30d9
  Thong Kuah authored Nov 29, 2018
  
  cbfd30d9
- Merge branch 'patch-26' into 'master' · eb22c2b7
  Stan Hu authored Nov 29, 2018
```
Update robots.txt to exclude group_members and project_members, which can expose…

See merge request gitlab-org/gitlab-ce!23463
```
  eb22c2b7