516e3532c6
Merge branch 'revert-b0498c17' into 'master'
...
Refactor `DynamicPathValidator` and `GitLab::Regex` some more
See merge request !11693
2017-05-25 15:14:16 +00:00
43b1750892
Revert "Remove changes that are not absolutely necessary"
...
This reverts commit b0498c176f
2017-05-24 20:59:26 +00:00
dfc2542f55
use full caps RSS instead of rss
2017-05-24 22:29:59 +02:00
6efe9c2f14
atom links with rss token instead of private token
2017-05-24 22:29:59 +02:00
2a6227a9fc
Merge branch 'dm-fix-routes' into 'master'
...
Fix ambiguous routing issues by teaching router about reserved words
See merge request !11570
2017-05-24 15:08:05 +00:00
b0498c176f
Remove changes that are not absolutely necessary
2017-05-23 20:38:35 -05:00
ed16c351c5
Fix specs
2017-05-23 20:38:26 -05:00
6f4e977046
Merge branch 'issue_32225' into 'master'
...
Add transient head_pipeline_of to pipeline factories
See merge request !11566
2017-05-23 18:53:29 +00:00
d07e85e103
Merge branch 'add-unicode-trace-feature-test' into 'master'
...
Add feature test with unicode trace
See merge request !10736
2017-05-23 15:45:41 +00:00
35ab669a95
Merge branch 'zj-sort-env-folders' into 'master'
...
Sort environments folders when opening them
Closes #30814
See merge request !11436
2017-05-23 10:10:54 +00:00
a74b7d90a8
Add feature test with unicode trace
...
Squashed commit of the following:
commit 43e5bba774e9e383dd55c665e82f6fcfc4ebfc4f
Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Mon Apr 17 17:28:44 2017 +0900
Add fix
commit 09610eebdf22ad048812bb86022504b2ad917e19
Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Mon Apr 17 17:03:49 2017 +0900
Add trace test
2017-05-23 18:08:51 +08:00
5c83d3aff2
Improve test wording
2017-05-23 10:59:50 +02:00
ad47f2094b
Merge branch 'prevent-project-transfer' into 'master'
...
Prevent project transfer if a new group is not selected
Closes #25455
See merge request !11214
2017-05-23 01:48:03 +00:00
3cfcbcf35b
Merge branch 'handle-transient-mr-query-count-spec' into 'master'
...
Handle transient MR query count spec
See merge request !11571
2017-05-22 20:53:23 +00:00
acd573f1e6
minor adjustments to the specs
2017-05-22 15:14:13 -05:00
921c2be44a
Add transient head_pipeline_of to pipeline factories
2017-05-22 17:06:45 -03:00
fbde5e3313
Renamed some messages and refactored the project_edit class to a function
2017-05-22 12:55:01 -05:00
42604d4c33
Prevent project transfer if a new group is not selected
2017-05-22 12:55:01 -05:00
0cbfa8cd2a
Merge branch 'zj-pipeline-json-performance' into 'master'
...
Improve pipeline size for query limit test
Closes #31906
See merge request !11323
2017-05-21 10:10:24 +00:00
28ffb4bf2f
Handle transient MR query count spec
2017-05-19 22:51:52 -03:00
776d4ba5c9
Merge branch 'fix-json-endpoint-redirection' into 'master'
...
Bugfix: don't redirect to JSON endpoints after sign in
See merge request !11561
2017-05-19 19:55:56 +00:00
5460153c9f
Merge branch '32536-mr-widget-performance-improvements' into 'master'
...
Load improvements related to MR widget
See merge request !11518
2017-05-19 19:52:45 +00:00
5d5e695473
Merge branch 'fix-issue-32506' into 'master'
...
Fix redirects modifying the host
Closes #32506
See merge request !11498
2017-05-19 19:28:38 +00:00
49ded5c1fa
Bugfix: don't redirect to JSON endpoints after sign in
2017-05-19 13:37:40 -05:00
49697bc8df
Refactor to more robust implementation
...
In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change:
When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`.
2017-05-19 09:13:27 -07:00
b3cf3d046b
Make sure fixture creation does not affect query count test
2017-05-19 10:19:04 -03:00
9a15b11237
Fixes the 500 for custom apearance header logo and logo
2017-05-19 09:20:51 +00:00
2792695cfa
Make sorting difference clearer
2017-05-19 08:18:10 +02:00
f9785dcec3
Fix ensure_canonical_path for top level routes
...
Don’t replace a substring of the path if it is part of the top level route.
E.g. When redirecting from `/groups/ups` to `/groups/foo`, be careful not to do `/grofoo/ups`.
Projects are unaffected by this issue, but I am grouping the `#ensure_canonical_path` tests similar to the group and user tests.
2017-05-18 16:24:10 -07:00
e8841e8dbc
Drop merge_check endpoint and use only MR show instead
2017-05-18 19:23:05 -03:00
11f82de1ef
Add test that fails without the fix
2017-05-18 10:30:17 -07:00
63da91725e
Improve pipeline size for query limit test
...
The pipeline was quite meagre in both stages and the number of groups.
This has been improved. Performance is not yet optimal, but to limit
this from sliding further this slippery slope, a hard limit has been
set.
2017-05-17 15:06:32 +02:00
0385f9efc2
Sort environments folders when opening them
...
Fixes gitlab-org/gitlab-ce#30814
2017-05-17 13:45:11 +02:00
44129aceaf
Codestyle
2017-05-13 02:18:57 +01:00
2e97db051c
Make the new repository_update_events configurable in System Hooks UI
2017-05-12 23:26:48 +01:00
e4261fe3ce
Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'
...
Fix conflict resolution from corrupted upstream
Closes gitlab-ee#2128
See merge request !11298
2017-05-12 20:37:30 +00:00
ad2bfeb857
Fix conflict resolution from corrupted upstream
...
I don't know why this happens exactly, but given an upstream and fork repository
from a customer, both of which required GC, resolving conflicts would corrupt
the fork so badly that it couldn't be cloned.
This isn't a perfect fix for that case, because the MR may still need to be
merged manually, but it does ensure that the repository is at least usable.
My best guess is that when we generate the index for the conflict
resolution (which we previously did in the target project), we obtain a
reference to an OID that doesn't exist in the source, even though we already
fetch the refs from the target into the source.
Explicitly setting the source project as the place to get the merge index from
seems to prevent repository corruption in this way.
2017-05-12 20:47:51 +01:00
bec9ec9a6e
Merge branch '27439-performance-deltas' into 'master'
...
Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries
See merge request !10981
2017-05-12 17:15:31 +00:00
f38779c6f5
Respond with 404 when metrics are not enabled or deployment_metrics is not implemented
2017-05-12 18:16:22 +02:00
ab98f8b5b1
Fix redirect message for groups and users
2017-05-11 15:28:13 -07:00
cb2f739d48
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
...
Resolve "Use consistent style for trailing commas"
Closes #27144
See merge request !11063
2017-05-10 21:43:34 +00:00
3db37e0562
Enable the Style/TrailingCommaInArguments cop
...
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
ea4eb46047
Merge branch 'tc-fix-private-subgroups-shown' into 'security'
...
Use GroupsFinder to find subgroups the user has access to
See merge request !2096
2017-05-10 16:48:18 +02:00
ad309f5d11
Merge branch 'snippets-finder-visibility' into 'security'
...
Refactor snippets finder & dont return internal snippets for external users
See merge request !2094
2017-05-10 16:48:18 +02:00
d9ec830a83
Merge branch 'snippets_visibility' into 'security'
...
Fix snippets visibility for show action - external users can not see internal snippets
See merge request !2087
2017-05-10 16:44:20 +02:00
a3607aa439
Merge branch 'issue_27168_2' into 'master'
...
Preloads head pipeline for each merge request
Closes #27168
See merge request !10064
2017-05-09 15:16:31 +00:00
0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
d9bebd89df
Fix specs 2
2017-05-08 11:29:10 -03:00
24824cbb4c
Fix Specs
2017-05-08 11:26:04 -03:00
8df3997a92
Add Pipeline Schedules that supersedes experimental Trigger Schedule
2017-05-07 22:35:56 +00:00
Robert Speicher
Douwe Maan
Alexis Reigel
Douwe Maan
Kamil Trzciński
Shinya Maeda
Z.J. van de Weg
Jose Ivan Vargas
Felipe Artur
Oswaldo Ferreira
Fatih Acet
Ruben Davila
Michael Kozono
Zeger-Jan van de Weg
Gabriel Mazetto
Sean McGivern
Pawel Chojnacki
Rémy Coutable
Sean McGivern