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
dfd6c3f824
Merge branch 'use-git-branch-merged' into 'master'
...
Fetch the merged branches at once.
Checking it one by one in the view. We don't cache this yet
because this would already much improve the performance.
A naive test against a particularly large repository:
``` ruby
begin
now = Time.now
branches.map{ |b| r.merged_to_root_ref?(b.name) }
Time.now - now
end # 8.265830782
```
Around 10 times faster:
``` ruby
begin
now = Time.now
r.merged_branches(branches.map(&:name))
Time.now - now
end # 0.807405397
```
This should make the branches page usable.
See merge request gitlab-org/gitlab-ce!14729
2017-10-27 15:55:19 +00:00
57d7ed05d9
Fetch the merged branches at once
2017-10-27 15:55:08 +00:00
7c4da276d3
Merge branch 'docs-update-ee_features.md-ce' into 'master'
...
Move doc/development/ee_features.md to CE
See merge request gitlab-org/gitlab-ce!15066
2017-10-27 14:45:00 +00:00
8acb6b7680
Merging EE doc into CE
2017-10-27 22:29:36 +08: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
aee7f0d0cb
Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'
...
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
See merge request gitlab-org/gitlab-ce!15054
2017-10-27 13:28:20 +00:00
ab9b54f977
Merge branch 'add-user-avatar-username-link' into 'master'
...
Add configurable option to display username in user avatar link component
See merge request gitlab-org/gitlab-ce!14902
2017-10-27 12:50:58 +00: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
43f0bca648
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
2017-10-27 13:59:25 +02: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
e9d3526123
Merge branch '39188-change-default-disabled-merge-message' into 'master'
...
Change default disabled merge request widget message to be more general
Closes #39188
See merge request gitlab-org/gitlab-ce!14960
2017-10-27 11:07:22 +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
284a94522f
Merge branch 'patch-29' into 'master'
...
Semi-linear history merge is now available in CE.
See merge request gitlab-org/gitlab-ce!15059
2017-10-27 09:45:10 +00:00
7e5e6823af
Merge branch '38869-groups-select' into 'master'
...
Remove groups_select from global namespace & simplifies the code
See merge request gitlab-org/gitlab-ce!15008
2017-10-27 09:05:03 +00:00
fed51d1eaa
Remove groups_select from global namespace & simplifies the code
2017-10-27 09:05:03 +00: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
be73ede362
Semi-linear history merge is now available in CE.
...
Already mentioned in the list above this one.
2017-10-27 08:50:51 +00: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
4e8010aa9d
Remove repetitive karma spec
2017-10-27 16:21:56 +08:00
b1b596be89
Improve spec to check hidden component
2017-10-27 16:20:53 +08:00
9a2b9d2345
Rename to shouldShowUsername
2017-10-27 16:11:02 +08:00
6d205a9b2c
Merge branch 'patch-29' into 'master'
...
Fix broken table of content links
Closes #39471
See merge request gitlab-org/gitlab-ce!15034
2017-10-27 06:43:44 +00:00
3aafcc16fb
Add KubernetesService#default_namespace tests
2017-10-26 18:18:11 +02:00
17b4367045
Revert "Merge branch '36670-remove-edit-form' into 'master'"
...
This reverts commit 915e35a2999533786f52
2017-10-26 15:53:55 +01:00
b3ba3996e0
Merge branch 'patch-30' into 'master'
...
Clarify the language around External Group membership with SAML SSO to clarify…
See merge request gitlab-org/gitlab-ce!15042
2017-10-26 14:41:29 +00:00
7d8eb4ddb0
Fix bitbucket login
2017-10-26 17:14:32 +03:00
6798bab12a
Remove duped tests
...
Likely caused by EE conflicts resolution
2017-10-26 16:04:28 +02:00
b0c419f9cd
Merge branch 'an/local_branches_opt_out' into 'master'
...
Make local_branches OPT_OUT
See merge request gitlab-org/gitlab-ce!15045
2017-10-26 12:08:29 +00: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
7ece18f141
Merge branch 'gl-username-hook-fix' into 'master'
...
Fix the incorrect value being used to set GL_USERNAME on hooks
See merge request gitlab-org/gitlab-ce!15038
2017-10-26 11:31:01 +00:00
cd08fd2363
Merge branch 'non-existing-repo-optimization' into 'master'
...
Avoid calling underlying methods on non-existing repos
See merge request gitlab-org/gitlab-ce!14962
2017-10-26 11:29:46 +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
f913f7a1ca
Merge branch 'feature/ssh_host_fingerprint' into 'master'
...
Automatic configuration settings page
Closes #25142
See merge request gitlab-org/gitlab-ce!13850
2017-10-26 10:55:48 +00:00
efdf51d838
Make local_branches OPT_OUT
2017-10-26 09:52:52 +00:00
acfa9090ec
Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups.
2017-10-26 00:40:19 +00: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
42a45392a9
Fix the incorrect value being used to set GL_USERNAME on hooks
2017-10-25 14:01:57 -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
53ab16f6ff
Merge branch 'gitaly-ff-merge-preparation' into 'master'
...
Move all rugged operation for ff_merge inside Gitlab::Git
Closes gitaly#683
See merge request gitlab-org/gitlab-ce!15011
2017-10-25 12:42:25 +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
700ead2e04
Merge branch '39419-remove-overzealous-tooltips-in-projects-page-tabs' into 'master'
...
Resolve "Remove overzealous tooltips in projects page tabs"
Closes #39419
See merge request gitlab-org/gitlab-ce!15017
2017-10-25 08:26:59 +00:00
7d20b693d0
Resolve "Remove overzealous tooltips in projects page tabs"
2017-10-25 08:26:58 +00:00
5b88d1bb13
Fix broken table of content links
2017-10-25 07:57:52 +00:00
fc52e43f09
Merge branch '32318-filter-icon' into 'master'
...
Remove filter icon from search bar
Closes #32318
See merge request gitlab-org/gitlab-ce!14966
2017-10-25 07:48:55 +00:00
cd0a7b475f
Remove filter icon from search bar
2017-10-24 12:17:21 -07:00
a64601b929
Move all rugged operation for ff_merge inside Gitlab::Git
...
We also delete some unused code related to the aforementioned feature.
2017-10-24 14:31:52 -03:00
95e56a6175
Merge branch 'jramsay-remove-superfluous-namespace' into 'master'
...
Remove superfluous namespace from cluster settings
See merge request gitlab-org/gitlab-ce!14987
2017-10-24 14:00:43 +00:00
30a8d2def3
Merge branch 'gitaly-gl-username' into 'master'
...
Support `Gitaly::User`'s gl_username field
See merge request gitlab-org/gitlab-ce!15016
2017-10-24 13:59:44 +00:00
Stan Hu
Rémy Coutable
Lin Jen-Shin (godfat)
Sean McGivern
Fatih Acet
Ahmad Sherif
Filipa Lacerda
Zeger-Jan van de Weg
Phil Hughes
Eric Eastwood
Nick Brown
Clement Ho
Achilleas Pipinellis
Alessio Caiazza
Sean McGivern
Douwe Maan
Jarka Kadlecova
Andrew Newdigate
Andrew Davis
Francisco Lopez
Alejandro Rodríguez
Victor Wu
Niek Nijland
Annabel Dunstone Gray