2994de7590
Upgrade Ruby to 2.3.5
...
Part of gitlab-org/gitlab-ce#38040
2017-10-31 14:19:14 +01:00
682923b79b
Merge branch '3674-hashed-storage-attachments' into 'master'
...
Hashed Storage support for Attachments
See merge request gitlab-org/gitlab-ce!15068
2017-10-31 12:18:47 +00:00
de16fb138b
Merge branch '39639-clusters-poll' into 'master'
...
Adds callback function to initial cluster request
Closes #39639
See merge request gitlab-org/gitlab-ce!15105
2017-10-31 12:14:59 +00:00
19bf710354
Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' into 'master'
...
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
Closes #39619
See merge request gitlab-org/gitlab-ce!15088
2017-10-31 11:58:38 +00:00
e829d5a084
Merge branch 'add-packagist-project-service' into 'master'
...
Add Packagist project service
See merge request gitlab-org/gitlab-ce!14493
2017-10-31 11:54:49 +00:00
ca01ee515c
Adds callback function to inital cluster request
2017-10-31 10:54:06 +00:00
68d1e9d1c4
Upload files through the multi-file editor
2017-10-31 10:47:10 +00:00
7e78db6e04
Merge branch '39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses' into 'master'
...
Resolve "Emails on Push are sent to only the first recipient when using AWS SES"
Closes #39593
See merge request gitlab-org/gitlab-ce!15083
2017-10-31 10:24:29 +00:00
bba020a56c
Merge branch '39582-nestingdepth-6' into 'master'
...
Enable NestingDepth (level 6) on scss-lint
Closes #39582
See merge request gitlab-org/gitlab-ce!15073
2017-10-30 18:09:55 +00:00
ff1e3a47c4
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
2017-10-30 17:19:51 +00:00
e80f056712
Refresh open Issue and Merge Request project counter caches when re-opening
2017-10-30 16:20:29 +00:00
7521f8a846
Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'
...
Fix broken Members link when relative URL root paths are used
See merge request gitlab-org/gitlab-ce!15070
2017-10-30 16:18:43 +00:00
f165b609b4
Merge branch '39570-performance-bar-appears-enabled-even-though-it-won-t-show-up' into 'master'
...
Resolve "Performance bar appears enabled even though it won't show up"
Closes #39570
See merge request gitlab-org/gitlab-ce!15084
2017-10-30 16:09:09 +00:00
d7942f223c
Allow to disable the Performance Bar and document the `p b` shortcut in its doc page
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-30 16:13:15 +01:00
748e5613f2
Merge branch 'update-fe-i18n-guide' into 'master'
...
Update i18n in FE docs for marking and interpolation
See merge request gitlab-org/gitlab-ce!15020
2017-10-30 14:16:15 +00:00
95fa62701c
Changelog
2017-10-30 14:53:03 +01:00
eddc9e41a6
Only set Auto-Submitted header once
...
The emails on push feature reuses the same email object, to avoid the expensive
work of generating the email body.
This interceptor would previously set multiple values for the same header, as
that's the mail gem's default behaviour when called with the same header more
than once.
We don't want to change the emails on push service (although it's the only place
where this happens), but fixing the interceptor is just as sensible anyway.
2017-10-30 13:50:19 +00:00
0cf7afac4f
Changed project select to use it independently and not onlt as a combobutton
2017-10-30 12:44:28 +00:00
7ba7fa5048
Fix 500 error for old (somewhat) MRs
2017-10-30 12:30:31 +00:00
c14697a50b
Merge branch '39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master'
...
Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout"
Closes #39054
See merge request gitlab-org/gitlab-ce!15063
2017-10-30 11:57:09 +00:00
609f4048dd
Merge branch 'make-merge-jid-handling-less-stateful' into 'master'
...
Fix widget of locked merge requests not being presented
See merge request gitlab-org/gitlab-ce!15069
2017-10-30 11:18:04 +00:00
192049a610
Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'
...
Use the correct project visibility in system hooks
Closes #39496
See merge request gitlab-org/gitlab-ce!15065
2017-10-30 08:53:27 +00:00
f03700f5e4
Merge branch '39366-email-confirmation-fails' into 'master'
...
grab the correct username when confirming secondary email
Closes #39366
See merge request gitlab-org/gitlab-ce!15010
2017-10-30 08:53:24 +00:00
7dbf114f59
Use the correct project visibility in system hooks
2017-10-30 09:05:06 +01:00
1cd0fbd96b
Enable NestingDepth (level 6) on scss-lint
2017-10-30 15:39:05 +09:00
7e60c76428
Add changelog
2017-10-29 12:29:05 +01:00
306d030240
more readable changelog
2017-10-28 10:49:14 +02:00
d6cd7006ae
Fix broken Members link when relative URL root paths are used
...
Navigating to the "Members" section of a project would omit the
relative URL root path. Fix the redirection and eliminate the
need for a redirection in the first place.
Fix other redirections failing to work with relative roots
2017-10-27 14:32:38 -07:00
57d7ed05d9
Fetch the merged branches at once
2017-10-27 15:55:08 +00:00
15e3d33761
Merge branch 'zj-commit-cache' into 'master'
...
Cache commits on the repository model
See merge request gitlab-org/gitlab-ce!14863
2017-10-27 13:31:05 +00:00
ba9b4c4de8
Avoid hitting statement timeout finding MR pipelines
...
For MRs with many thousands of commits, `SELECT DISTINCT(sha)` will be very
slow.
What we can't do to fix this:
1. Add an index. Postgres won't use it for DISTINCT without a lot of ceremony.
2. Do the `uniq` in Ruby. That can still be very slow with hundreds of
thousands of commits.
3. Use a subquery. We haven't removed the `st_commits` column yet, but we will
soon.
Until 3 is available to us, we can just do 2, but also add a limit clause. There
is no ordering, so this may return different results, but our goal with these
MRs is just to get them to load, so it's not a huge deal.
2017-10-27 14:20:55 +01:00
48851ff308
add changelog entry
2017-10-27 15:20:46 +02:00
172ebcb8bb
Merge branch 'ac-k8s-namespace-validator' into 'master'
...
Sanitize k8s default_namespace
Closes #38692
See merge request gitlab-org/gitlab-ce!15053
2017-10-27 12:04:22 +00:00
fa3b473660
Merge branch '39441-bring-edit-form-back' into 'master'
...
Revert "Merge branch '36670-remove-edit-form' into 'master'"
Closes #39441
See merge request gitlab-org/gitlab-ce!15049
2017-10-27 11:54:57 +00:00
3411fef1df
Cache commits on the repository model
...
Now, when requesting a commit from the Repository model, the results are
not cached. This means we're fetching the same commit by oid multiple times
during the same request. To prevent us from doing this, we now cache
results. Caching is done only based on object id (aka SHA).
Given we cache on the Repository model, results are scoped to the
associated project, eventhough the change of two repositories having the
same oids for different commits is small.
2017-10-27 12:49:11 +02:00
b7835587e5
Change default disabled merge request widget message to "Merge is not allowed yet"
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188
2017-10-27 04:52:30 -04:00
a1aa4f00c2
Merge branch '39495-fix-bitbucket-login' into 'master'
...
Fix bitbucket login
Closes #39495
See merge request gitlab-org/gitlab-ce!15051
2017-10-27 08:22:53 +00:00
17b4367045
Revert "Merge branch '36670-remove-edit-form' into 'master'"
...
This reverts commit 915e35a2999533786f52
2017-10-26 15:53:55 +01:00
7d8eb4ddb0
Fix bitbucket login
2017-10-26 17:14:32 +03:00
98c57e9a9f
Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'
...
Add path attribute to WikiFile class
Closes #39420
See merge request gitlab-org/gitlab-ce!15019
2017-10-26 11:41:04 +00:00
c29d2c6a41
Merge branch 'api-configure-jira' into 'master'
...
Validate username/pw for Jiraservice, require them in the API
Closes #36621
See merge request gitlab-org/gitlab-ce!15025
2017-10-26 11:20:48 +00:00
76becfb5b4
Add path attribute to WikiFile class
...
Fixes #39420
2017-10-26 13:04:33 +02:00
294f40e2c8
Added ssh fingerprint, gitlab ci and pages information in an instance configuration page
...
Closes #25142
2017-10-25 23:51:26 +03:00
3ddffec0d6
Merge branch '38178-fl-mr-notes-components' into 'master'
...
Moves placeholders components into shared folder with documentation.
See merge request gitlab-org/gitlab-ce!14964
2017-10-25 15:45:40 +00:00
e81d74b925
Merge branch '35199-case-insensitive-branches-search' into 'master'
...
Add case insensitive branches search
Closes #35199
See merge request gitlab-org/gitlab-ce!14995
2017-10-25 09:14:32 +00:00
7d20b693d0
Resolve "Remove overzealous tooltips in projects page tabs"
2017-10-25 08:26:58 +00:00
cd0a7b475f
Remove filter icon from search bar
2017-10-24 12:17:21 -07:00
d27039d14b
Merge branch 'bvl-dont-rename-free-names' into 'master'
...
Don't rename groups/projects that aren't reserved anymore
Closes #39387
See merge request gitlab-org/gitlab-ce!15029
2017-10-24 13:58:29 +00:00
a280c6871c
Don't rename groups/projects that aren't reserved anymore
...
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12932 we
freed up some names. But we were still renaming them.
2017-10-24 16:06:01 +03:00
bf4e97fc83
Merge branch 'sh-memoize-logger' into 'master'
...
Memoize GitLab logger to reduce open file descriptors
Closes gitlab-ee#3664
See merge request gitlab-org/gitlab-ce!15007
2017-10-24 12:43:30 +00:00
Zeger-Jan van de Weg
Douwe Maan
Phil Hughes
Rémy Coutable
Kamil Trzciński
Filipa Lacerda
Annabel Dunstone Gray
Mark Fletcher
Rob Ede
Sean McGivern
Gabriel Mazetto
Sean McGivern
Francisco Javier López
AlexWayfer
Yorick Peterse
Bob Van Landuyt
Takuya Noguchi
Oswaldo Ferreira
Brett Walker
Stan Hu
Lin Jen-Shin (godfat)
Eric Eastwood
Jarka Kadlecova
Ahmad Sherif
Francisco Lopez
Victor Wu
Nick Thomas