root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
57,228 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

57228 Commits

Author SHA1 Message Date
Douwe Maan 14644d40e0 Do not validate CSRF token in API unless needed 2017-08-02 18:20:31 +02:00
Douwe Maan 6fe736f2c9 Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master' 
Fix relative_url_root support for webpack chunks

Closes #35567

See merge request !13165
 2017-07-31 07:27:57 +00:00
Achilleas Pipinellis 9a3b283402 Merge branch 'fix-user-creation-doc' into 'master' 
Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation'

Closes #35614

See merge request !13160
 2017-07-31 05:43:10 +00:00
Achilleas Pipinellis a5689a1a36 Merge branch 'sh-aws-efs-docs' into 'master' 
Add a note about EFS and GitLab log files

See merge request !13180
 2017-07-31 05:40:50 +00:00
Stan Hu 06a760e139 Add a note about EFS and GitLab log files 
[ci skip]
 2017-07-30 09:51:08 -05:00
Clement Ho 4c89929fb4 Merge branch '35044-projects-logo-are-not-centered-vertically-on-projects-page' into 'master' 
Projects logo are not centered vertically on projects page

Closes #35044, #31753, and #35546

See merge request !13124
 2017-07-28 21:41:41 +00:00
Florian Lemaitre 987b53e321 Projects logo are not centered vertically on projects page 2017-07-28 21:41:40 +00:00
Robert Speicher da967803cc Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into 'master' 
Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs

Closes #35599

See merge request !13126
 2017-07-28 18:05:58 +00:00
Mike Greiling eac8ae0fe0 add CHANGELOG.md entry for !13165 2017-07-28 12:56:43 -05:00
Robert Speicher 62e9bb16dc Merge branch 'rs-fix-master' into 'master' 
Fix spec/features/projects/branches_spec

See merge request !13163
 2017-07-28 17:49:52 +00:00
Mike Greiling ebd5f51488 fix relative_url_root support for webpack chunks 2017-07-28 12:49:07 -05:00
Rémy Coutable afdb3ccbaf Merge branch 'ux-guide-search-filter-sort' into 'master' 
Add copy about search terms to ux guide

See merge request !10267
 2017-07-28 17:25:01 +00:00
Marcia Ramos c65907cd9e Merge branch 'docs/jira-article' into 'master' 
Add link to JIRA article in docs

Closes #35046

See merge request !13154
 2017-07-28 17:08:03 +00:00
Marcia Ramos 9d64e44efa Merge branch 'docs/ci-only-except' into 'master' 
Explain all possible values of 'only' and 'except'

Closes #34119

See merge request !13138
 2017-07-28 17:05:18 +00:00
Robert Speicher 0bb58ff885 Merge branch 'dm-large-push-performance' into 'master' 
Load and process at most 100 commits when pushing into default branch

Closes #35531

See merge request !13132
 2017-07-28 17:03:17 +00:00
Douwe Maan 8b68b69572 Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master' 
Fix replying to commit comments on merge requests created from forks

Closes #31772

See merge request !13137
 2017-07-28 16:53:10 +00:00
Robert Speicher 8aaaefa5f6 Fix spec/features/projects/branches_spec 
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666
 2017-07-28 12:52:40 -04:00
Rémy Coutable 7e83f244ca Merge branch 'bugfix/fix_v3_project_hooks_build_events' into 'master' 
Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id

See merge request !12673
 2017-07-28 16:27:10 +00:00
Richard Clamp e77e9b0077 Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id 2017-07-28 16:27:10 +00:00
Rémy Coutable a2ba403e27
Fix a spec that was assuming to be on the wrong page 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-28 18:19:25 +02:00
tauriedavis c734aa8608 Add copy about search terms to ux guide 2017-07-28 09:12:34 -07:00
Dan Dunckel 04e4210785 Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation' 2017-07-28 09:53:09 -06:00
Grzegorz Bizon 699a30f06b Merge branch '35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline' into 'master' 
Resolve "Comment appears in a wrong place after changing diff view to inline"

Closes #35695

See merge request !13156
 2017-07-28 15:38:49 +00:00
Rémy Coutable 6e3eec16c7 Merge branch '26890-sort-branches' into 'master' 
This makes the default sort order for branches 'recently updated' rather than by name.

Closes #26890

See merge request !8666
 2017-07-28 15:27:49 +00:00
Sean McGivern 75d04f6a29 Fix replying to commit comments on MRs from forks 
A commit comment shows in the MR, but if the MR is from a fork, it will have a
different project ID to the MR's target project. In that case, add an
note_project_id param so that we can pick the correct project for the note.
 2017-07-28 16:25:13 +01:00
Sean McGivern bb23d462fa Merge branch 'fix-500-error-when-rendering-avatar-for-deleted-project-creator' into 'master' 
Fix 500 error when rendering avatar for deleted project creator

See merge request !13110
 2017-07-28 15:23:41 +00:00
Athar Hameed 9442c33584 Fix 500 error when rendering avatar for deleted project creator 2017-07-28 15:23:40 +00:00
Douwe Maan 0e355e5c92 Load and process at most 100 commits when pushing into default branch 2017-07-28 17:23:13 +02:00
Sean McGivern 883be9c67b Merge branch 'merge-issuable-reopened-into-opened-state' into 'master' 
Merge issuable "reopened" state into "opened"

See merge request !12972
 2017-07-28 15:15:38 +00:00
Rémy Coutable 58c058c960 Merge branch 'techbeacon_ci' into 'master' 
added article from techbeacon on CI

See merge request !10452
 2017-07-28 15:09:24 +00:00
Rémy Coutable 4d69debcc7 Merge branch 'patch-24' into 'master' 
Update gitlab_flow.md, Teatro seems to be completely dead, see also…

See merge request !13157
 2017-07-28 15:06:31 +00:00
Rémy Coutable ad6487cec8 Merge branch 'log_webhook_timeout' into 'master' 
Log web hook execution timeout events

See merge request !13134
 2017-07-28 15:06:15 +00:00
Rémy Coutable 44167f5c2c Merge branch 'docs-metrics-haproxy' into 'master' 
Docs: fix HAProxy name and exporter's link

See merge request !13091
 2017-07-28 14:59:40 +00:00
Sean McGivern bd2b68d73e Merge branch 'dm-api-csrf-token-verification' into 'master' 
Add log messages to clarify log messages about API CSRF token verification failure

Closes #35705

See merge request !13158
 2017-07-28 14:39:36 +00:00
Rémy Coutable 60797a42b4 Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-28 16:33:30 +02:00
Douwe Maan d020eabf29 Add log messages to clarify log messages about API CSRF token verification failure 2017-07-28 15:39:39 +02:00
bart 329391ced7 Update gitlab_flow.md, Teatro seems to be completely dead, see also https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774 2017-07-28 13:28:47 +00:00
Rémy Coutable 48c51e207e Merge branch 'remove-default-access-levels' into 'master' 
Make access level for protected tag factories more compatible with EE

See merge request !13133
 2017-07-28 13:11:52 +00:00
Sean McGivern fdfb4bbe5c Fix diff commenting results just after changing view 
When you change the diff view (inline / side-by-side), we set a cookie based on
that new view. When you add a comment, we choose the style to use in the
response based on that cookie.

However, when you have just changed diff style, the request cookie will contain
the old value, so we should use the view param instead.
 2017-07-28 13:59:57 +01:00
Filipa Lacerda 4ccecb7db4 Merge branch '35691-images-in-wiki-display-have-wrong-size' into 'master' 
Resolve "Images in Wiki display have wrong size"

Closes #35691

See merge request !13153
 2017-07-28 12:51:12 +00:00
James Edwards-Jones 20d7b04639 Update CHANGELOG.md for 9.4.2 
[ci skip]
 2017-07-28 13:46:01 +01:00
Filipa Lacerda 96701fd469 Merge branch 'help-page-breadcrumb-title-fix' into 'master' 
Fixed the breadcrumb title for help pages

Closes #35679

See merge request !13151
 2017-07-28 12:16:49 +00:00
Tim Zallmann 563cb60e75 Merge branch 'ph-inline-js' into 'master' 
Removed inline JS in shared HAML files

See merge request !13073
 2017-07-28 11:45:29 +00:00
Kamil Trzciński fa1e41ea64 Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master' 
Follow-up from "Allow to use cross project pipelines" ver 2

Closes #35282, gitlab-ee#2604, and #35584

See merge request !13102
 2017-07-28 11:43:00 +00:00
Tim Zallmann e1c432d848 none is not a CSS Value for sizes ;-) 2017-07-28 13:34:58 +02:00
Yorick Peterse 6ef87a2083
Merge issuable "reopened" state into "opened" 
Having two states that essentially mean the same thing is very much like
having a boolean "true" and boolean "mostly-true": it's rather silly.
This commit merges the "reopened" state into the "opened" state while
taking care of system notes still showing messages along the lines of
"Alice reopened this issue".

A big benefit from having only two states (opened and closed) is that
indexing and querying becomes simpler and more performant. For example,
to get all the opened queries we no longer have to query both states:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state IN ('opened', 'reopened');

Instead we can query a single state directly, which can be much faster:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state = 'opened';

Further, only having two states makes indexing easier as we will only
ever filter (and thus scan an index) using a single value. Partial
indexes could help but aren't supported on MySQL, complicating the
development process and not being helpful for MySQL.
 2017-07-28 13:31:51 +02:00
Lin Jen-Shin f35563b238 Make access level more compatible with EE 
So the behaviour would be similar in CE and EE
 2017-07-28 18:55:29 +08:00
Achilleas Pipinellis 5899294583 Add link to JIRA article in docs 2017-07-28 13:47:41 +03:00
Rémy Coutable 8626cdc3b3 Merge branch 'rs-empty_project-features' into 'master' 
Use `:empty_project` where possible in feature specs

See merge request !13118
 2017-07-28 10:00:05 +00:00
Douwe Maan 850a22547c Merge branch 'zj-delete-mm-team' into 'master' 
Remove Mattermost team with GitLab group

Closes #30023

See merge request !11362
 2017-07-28 09:58:20 +00:00