7dbdc9837c
Merge branch 'dm-copy-parallel-diff' into 'master'
...
Only copy old/new code when selecting left/right side of parallel diff
See merge request gitlab-org/gitlab-ce!14561
2017-10-03 09:44:38 +00:00
b8e47d7263
Merge branch 'fix-kubectl-180' into 'master'
...
Fix broken certificate-authority-data with kubectl >= 1.8.0
Closes #38685
See merge request gitlab-org/gitlab-ce!14635
2017-10-03 08:57:12 +00:00
971e2fc63f
Merge branch '38202-cannot-rename-a-hashed-project' into 'master'
...
Resolve "Cannot rename a hashed project"
Closes #38202
See merge request gitlab-org/gitlab-ce!14428
2017-10-03 08:49:43 +00:00
848fdc813e
Merge branch 'sh-improve-perf-notes-actions' into 'master'
...
Improve performance of filtering notes in NotesController
See merge request gitlab-org/gitlab-ce!14645
2017-10-03 08:29:14 +00:00
4582fff662
Merge branch 'close-issue-by-implements' into 'master'
...
Add "implements" to the default issue closing message regex
Closes #38424
See merge request gitlab-org/gitlab-ce!14612
2017-10-03 08:27:54 +00:00
0ac06c89e9
Merge branch 'ff_port_from_ee' into 'master'
...
Move Fast-Forward Merge to CE
See merge request gitlab-org/gitlab-ce!14272
2017-10-03 08:24:31 +00:00
27cc1c2b28
Fix for Gitaly nil encoding issue
2017-10-03 08:03:19 +00:00
d14230dd6b
Merge branch 'gitaly-get-archive' into 'master'
...
Send extra Gitaly params for `send_git_archive` if needed
See merge request gitlab-org/gitlab-ce!14605
2017-10-03 07:40:20 +00:00
40c6128b39
Fix broken certificate-authority-data with kubectl >= 1.8.0
2017-10-03 09:10:40 +02:00
bdc50ed779
Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master'
...
Whitelist authorized_keys.lock in the gitlab:check rake task
Closes #38635
See merge request gitlab-org/gitlab-ce!14624
2017-10-03 06:51:14 +00:00
10096256f1
Improve performance of filtering notes in NotesController
...
Reduces the number of queries needed to redact notes to which
the user does not have access. Also includes an N+1 query test
as a guard against future issues.
This is a follow-up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14327#note_40976854 .
2017-10-02 21:48:34 -07:00
624d54d2a8
Fix specs for project creation and update services
2017-10-02 21:41:23 +02:00
47978e9781
Doesn't check if path exists on disk when renaming a hashed project
2017-10-02 21:41:22 +02:00
40060b18c7
[ci skip] Fix archive spec descrptions
2017-10-02 15:33:31 -03:00
95f613837d
Merge branch 'sh-fix-import-repos' into 'master'
...
Fix gitlab-rake gitlab:import:repos task
Closes #37682
See merge request gitlab-org/gitlab-ce!14597
2017-10-02 17:34:08 +00:00
fd8c56008f
Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master'
...
Fix case sensitive email confirmation on signup
See merge request gitlab-org/gitlab-ce!14606
2017-10-02 16:57:21 +00:00
b74c643c66
Only copy old/new code when selecting left/right side of parallel diff
2017-10-02 18:39:25 +02:00
bac2916030
Fix gitlab-rake gitlab:import:repos task
...
Because of a change in GitLab 9.5.4 to prevent users from assuming control of
a repository already on disk, the import task broke. Imports would fail with
the message, "There is already a repository with that name on disk".
This change skips the validation when the import is done from the
command-line.
Closes #37682
2017-10-02 08:51:37 -07:00
fce708c154
Send extra Gitaly params for `send_git_archive` if needed
2017-10-02 12:39:42 -03:00
f1b8d79f4a
Merge branch 'fix/gpg/case-insensitive' into 'master'
...
Make GPG validation case insensitive
See merge request gitlab-org/gitlab-ce!14376
2017-10-02 15:37:04 +00:00
b40192a946
Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'
...
Attempt to link saml users to ldap by email
Closes #33493
See merge request gitlab-org/gitlab-ce!14216
2017-10-02 15:24:48 +00:00
4716e81f9d
Merge branch 'revert-configurable-size-limits' into 'master'
...
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
See merge request gitlab-org/gitlab-ce!14628
2017-10-02 14:39:55 +00:00
a5d47bb063
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
...
This reverts commit 1d3c33b57e
2017-10-02 13:54:40 +01:00
4e4a29ad75
Add "implements" to the default issue closing message regex
2017-10-02 12:02:38 +00:00
011c168bff
Refactors SAML identity creation in gl_user.
2017-10-02 11:35:09 +01:00
43c712f5dd
Whitelist authorized_keys.lock in the gitlab:check rake task
2017-10-02 11:25:02 +01:00
a0ac2d932c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee
2017-10-02 13:15:46 +03:00
284185a356
Add merge_requests_rebase_enabled to json entities for specs
2017-10-02 12:54:28 +03:00
972c5e8900
Fix 'gitlay' typo in spec
2017-10-02 11:37:26 +02:00
0a69abdb28
Merge branch 'gitaly-add-branch' into 'master'
...
Implement OperationService.UserAddBranch Gitaly RPC
Closes gitaly#544
See merge request gitlab-org/gitlab-ce!14522
2017-10-02 09:27:23 +00:00
664cd27faa
Merge branch '38571-fix-exception-in-raven-report' into 'master'
...
Ensure no exception is raised when Raven tries to get the current user in API context
Closes #38571
See merge request gitlab-org/gitlab-ce!14580
2017-10-02 08:35:12 +00:00
209d7575b6
Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-state' into 'master'
...
Resolve "Issue Sidebar : Don't render participants in collapsed state"
Closes #34366
See merge request gitlab-org/gitlab-ce!14270
2017-10-02 08:23:07 +00:00
147c46cca1
Merge branch '38052-use-simple-api-for-projects' into 'master'
...
Use `simple=true` for projects API in Projects dropdown for better search performance
Closes #38052
See merge request gitlab-org/gitlab-ce!14585
2017-10-02 07:39:07 +00:00
a030dc4199
Merge branch 'remote_user' into 'master'
...
Add GL_USERNAME environment variable for hooks
See merge request gitlab-org/gitlab-ce!13264
2017-10-02 07:16:22 +00:00
6188e449de
Fix pushes to an empty repository not invalidating has_visible_content? cache
...
`Repository#has_visible_content?` used to rely on the cached count of local branches, but
since it is now an independently cached value it needs to be invalidated on its own.
Closes #38646
2017-10-01 22:14:11 -07:00
feae8b2e44
use LazyImageTagHelper.placeholder_image for blank src base64 image
2017-10-01 16:14:12 +01:00
b2232f7412
Create failing test case
2017-09-30 18:33:12 -05:00
fa5f0164eb
Implement OperationService.UserAddBranch Gitaly RPC
2017-09-30 00:58:56 -03:00
16f850033f
Populate `Gitlay::Repository`'s `gl_repository` field
2017-09-30 00:58:56 -03:00
a97ff8aae0
Add a factory for `Gitaly::GitCommit`s
2017-09-30 00:51:16 -03:00
dbcf48af8b
Add username as GL_USERNAME in hooks (http)
...
When calling pre-receive, post-receive, and update hooks, add the GitLab
username as the GL_USERNAME environment variable.
This patch only handles cases where pushes are over http, or via
the web interface. Later, we will address the ssh case.
2017-09-29 18:12:03 -04:00
a212391f0f
Make GPG validation case insensitive.
...
In line with other changes in GitLab, make email address validation
properly case insensitive. The email address in the commit may be in
any case, so it needs downcasing to match the address stored in GitLab
for the user. Without this change the comparison fails and commits are
not marked as verified.
See #37009 .
2017-09-29 20:30:58 +01:00
439e3f0735
Port semi-linear merge strategy to CE (mostly FE)
2017-09-29 14:13:35 -05:00
3040b994df
Ensure no exception is raised when Raven tries to get the current user in API context
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-09-29 18:57:22 +02:00
e5fecc3a37
Create repositories via Gitaly
2017-09-29 18:27:06 +02:00
c49d19a5dc
Merge branch 'fork-btn-enabled-user-groups' into 'master'
...
Fix fork button being disabled for users who can fork to group
Closes #38462
See merge request gitlab-org/gitlab-ce!14551
2017-09-29 15:55:14 +00:00
49fdaf9ee8
Merge branch 'hash-mr-scroll-load' into 'master'
...
Fixed anchored content not being scrolled into view
Closes #38326
See merge request gitlab-org/gitlab-ce!14562
2017-09-29 15:14:22 +00:00
4a17ac29b8
Use `simple=true` for projects API for better performance
2017-09-29 20:36:44 +05:30
05e9c9f77e
Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master'
...
Insert at most 1,000 rows at once in MR diff background migration
Closes #36631 et #37505
See merge request gitlab-org/gitlab-ce!13661
2017-09-29 13:43:28 +00:00
5307844c9a
Merge branch 'dm-json-page-title' into 'master'
...
Use backend-provided page title in repo editor
Closes #36029
See merge request gitlab-org/gitlab-ce!13763
2017-09-29 13:22:27 +00:00
Phil Hughes
Kamil Trzciński
Nick Thomas
Douwe Maan
Sean McGivern
Andrew Newdigate
Alessio Caiazza
Stan Hu
Douglas Barbosa Alexandre
Alejandro Rodríguez
Robert Speicher
Douwe Maan
Dmitriy Zaporozhets
Sean McGivern
Guilherme Vieira
Tiago Botelho
Valery Sizov
Jacob Vosmaer
Tim Zallmann
Luke "Jared" Bennett
robdel12
David Turner
Tim Bishop
Eric Eastwood
Rémy Coutable
Filipa Lacerda
kushalpandya
Jacob Schatz