fe2e8dba22
fixed infinite loop crashing tests
2018-02-01 12:26:55 +00:00
4cea24f89c
Converted todos.js to axios
2018-02-01 11:32:31 +00:00
43f1088f5b
Converted usage_ping.js to use axios
...
also removed dependancy on jQuery because it is super simple & not required
2018-02-01 11:18:01 +00:00
ee1c471bad
Converted pager.js to axios
2018-02-01 11:12:37 +00:00
ab8e3a5595
Converted notifications_form.js to axios
2018-02-01 10:53:36 +00:00
1c8553f21e
Converted notes.js to axios
2018-02-01 10:50:18 +00:00
c09a89c755
Converted branch_graph.js to axios
2018-02-01 10:42:49 +00:00
b5b304466f
Converted mini_pipeline_graph_dropdown.js to axios
2018-02-01 10:34:12 +00:00
76b9f1a4c5
Merge branch '42497-rubocop-style-regexpliteral' into 'master'
...
Enable Style/RegexpLiteral cop
Closes #42497
See merge request gitlab-org/gitlab-ce!16752
2018-02-01 09:11:09 +00:00
ab0d41e2da
Merge branch 'fix-internationalization-namespace' into 'master'
...
Remove namespaced internationalization import
See merge request gitlab-org/gitlab-ce!16838
2018-02-01 08:47:25 +00:00
dbcd43db16
Merge branch 'sh-remove-universal-darwin'
2018-01-31 20:37:56 -08:00
9291048fc0
Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock
...
Closes gitlab-org/omnibus-gitlab#3128
2018-01-31 20:22:22 -08:00
f9e9d5d50e
Merge branch 'qa-160' into 'master'
...
Add a QA scenario for creating an issue
Closes gitlab-qa#160
See merge request gitlab-org/gitlab-ce!16802
2018-02-01 00:08:23 +00:00
b00c48f407
Merge branch 'axios-find-file' into 'master'
...
Replace $.ajax in find file with axios
See merge request gitlab-org/gitlab-ce!16841
2018-02-01 00:01:28 +00:00
c25bbdf8c2
Merge branch 'axios-calendar' into 'master'
...
Replace $.ajax in activity calendar with axios
See merge request gitlab-org/gitlab-ce!16839
2018-01-31 22:37:41 +00:00
b8c43a73d3
Replace $.ajax in find file with axios
2018-01-31 16:27:03 -06:00
9709b5ed14
Replace $.ajax in activity calendar with axios
2018-01-31 15:56:26 -06:00
283c0a9d28
Merge branch 'repository-log-disable-walk' into 'master'
...
Remove Rugged::Walk implementation of #log
See merge request gitlab-org/gitlab-ce!16798
2018-01-31 21:54:02 +00:00
10a2d95a7b
Remove namespaced internationalization import
2018-01-31 21:53:40 +00:00
560c93e60e
Merge branch '4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-group' into 'master'
...
Refactor groups controller to match EE
Closes gitlab-ee#4761
See merge request gitlab-org/gitlab-ce!16832
2018-01-31 17:42:42 +00:00
2b6307f6ad
Enable RuboCop Style/RegexpLiteral
2018-02-01 02:06:07 +09:00
9c34c02380
Merge branch 'fix-install-docs' into 'master'
...
[ci skip] Fix example commands to refer to the correct versions
See merge request gitlab-org/gitlab-ce!16683
2018-01-31 17:04:28 +00:00
c01f81fa08
[ci skip] Fix example commands to refer to the correct versions
2018-01-31 17:02:50 +00:00
a4d84192ae
Merge branch 'fl-mr-widget' into 'master'
...
Move mr widget related links into a vue file
See merge request gitlab-org/gitlab-ce!16825
2018-01-31 16:49:35 +00:00
f4b91f7ab8
Merge branch 'axios-get-render-math' into 'master'
...
Replace $.get in render math with axios
See merge request gitlab-org/gitlab-ce!16697
2018-01-31 16:07:33 +00:00
078dac4268
Merge branch 'axios-common-utils-favicon' into 'master'
...
Use axios instead of jquery ajax for setCiStatusFavicon
See merge request gitlab-org/gitlab-ce!16784
2018-01-31 15:26:26 +00:00
2f1a55fa4e
Use axios instead of jquery ajax for setCiStatusFavicon
2018-01-31 15:24:54 +00:00
406e10b89c
refactor groups controller to match EE
2018-01-31 16:23:15 +01:00
a0fc0fcc53
Merge branch 'rugged-reference-cache-rescue' into 'master'
...
Stop rescuing Rugged::Reference in Repository cache
See merge request gitlab-org/gitlab-ce!16770
2018-01-31 14:00:37 +00:00
514826f50b
Fix broken test
2018-01-31 12:27:18 +00:00
08e013431a
Merge branch 'sh-fix-project-members-api-perf' into 'master'
...
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
See merge request gitlab-org/gitlab-ce!16751
2018-01-31 11:35:56 +00:00
5d8bb33d48
Merge branch 'zj-gitaly-server-info' into 'master'
...
Gitaly Server info for admin panel
See merge request gitlab-org/gitlab-ce!16794
2018-01-31 11:31:29 +00:00
4251c6565f
Merge branch 'qa-new-dropzone-component' into 'master'
...
Introduce a new QA::Gitlab::Page::Component::Dropzone class
See merge request gitlab-org/gitlab-ce!16805
2018-01-31 11:16:29 +00:00
dacd9dbef4
Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'
...
Move Repository#can_be_merged? to Gitlab::Git::Repository
Closes #42544
See merge request gitlab-org/gitlab-ce!16771
2018-01-31 11:02:09 +00:00
f8250f8fd0
Merge branch 'sh-fix-events-collection' into 'master'
...
Fix not all events being shown in group dashboard
Closes #42560
See merge request gitlab-org/gitlab-ce!16819
2018-01-31 10:57:11 +00:00
afe665d9c0
Remove Rugged::Walk implementation of #log
2018-01-31 11:56:36 +01:00
bebb9c0c6d
Merge branch 'rc/remove-brakeman-from-codequality' into 'master'
...
Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job
See merge request gitlab-org/gitlab-ce!16808
2018-01-31 10:28:38 +00:00
2f4d088fb4
Introduce a new QA::Gitlab::Page::Component::Dropzone class
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-31 11:09:21 +01:00
787ac467a2
Add a QA scenario for creating an issue
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-31 11:02:15 +01:00
36b6746f25
Merge branch '42239-fix-mysql-source-installs' into 'master'
...
Resolve "mysql-only installation from source broken: Gem::LoadError: pg is not part of the bundle"
Closes #42239
See merge request gitlab-org/gitlab-ce!16810
2018-01-31 09:57:11 +00:00
cafbe155f5
Merge branch '4635-unify-jobs-and-builds-sepc' into 'master'
...
Unify and split CE/EE for spec/requests/api/jobs_spec.rb
See merge request gitlab-org/gitlab-ce!16804
2018-01-31 09:56:40 +00:00
e6579d82cb
Merge branch 'update-qa-docs-with-directory-req' into 'master'
...
Add note about needing to be in the `$gdk/gitlab/qa` directory for `bin/qa` to work properly
See merge request gitlab-org/gitlab-ce!16824
[ci skip]
2018-01-31 09:44:23 +00:00
afcd9fc7f4
Merge branch 'ph-ajax-to-axios' into 'master'
...
Converted $.ajax calls in some JS files to axios
See merge request gitlab-org/gitlab-ce!16717
2018-01-31 09:37:23 +00:00
3241690688
Merge branch 'docs-42499-api-repo-archive-format-param' into 'master'
...
Document format parameter for Repository Archive endpoint
Closes #42499
See merge request gitlab-org/gitlab-ce!16766
2018-01-31 09:29:40 +00:00
94a3dbca33
Gitaly Server info for admin panel
...
Implements the client side for gitlab-org/gitaly#819 . Which is a server
info command. This checks the server version and git binairy version on
the server.
A small UI was added for administrators, so they can check the status of
the Gitaly server. This is done for each storage the monolith knows.
Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That
MR removed the Git version too, but didn't replace it with anything.
2018-01-31 08:54:45 +01:00
139857d915
Add note about being in the `qa` directory for `bin/qa` to work
...
I ran into some issues when trying it out
https://gitlab.slack.com/archives/C3JJET4Q6/p1517384135000134
2018-01-31 01:41:31 -06:00
46a6edc731
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
...
We can simplify the code quite a bit and improve performance by using
grape-entity merge fields:
https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields
Relates to #42030
2018-01-30 21:46:09 -08:00
30e6cfa05a
Fix not all events being shown in group dashboard
...
The group activity feed was limited to the first 20 projects found
in the group, which caused activity from some projects to be omitted.
A limit of 20 is applied to the query for events, so the
extra pagination does little in the way of performance.
Closes #42560
2018-01-30 17:04:22 -08:00
120c79020d
Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into 'master'
...
Add support for PreReceiveError in UserMergeBranch RPC
Closes gitaly#979
See merge request gitlab-org/gitlab-ce!16765
2018-01-30 23:31:42 +00:00
e47b7a286d
Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'
...
Migrate Git::Repository#delete_refs to Gitaly
Closes gitaly#967
See merge request gitlab-org/gitlab-ce!16723
2018-01-30 23:26:50 +00:00
Phil Hughes
Rémy Coutable
Filipa Lacerda
Stan Hu
Robert Speicher
Fatih Acet
Clement Ho
Douwe Maan
Takuya Noguchi
Nick Thomas
Alejandro Rodríguez
James Lopez
Sean McGivern
Grzegorz Bizon
Jacob Vosmaer
Dmitriy Zaporozhets
Achilleas Pipinellis
Zeger-Jan van de Weg
Eric Eastwood