Eric Eastwood
3403bdc5f2
Fix reference to node_modules in built package
...
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192
See https://gitlab.slack.com/archives/frontend/p1488973548024005
2017-03-08 10:41:16 -06:00
Sean McGivern
d20a603385
Merge branch 'update_GITLAB_SHELL_VERSION' into 'master'
...
Update GITLAB_SHELL_VERSION to 5.0.0
See merge request !9809
2017-03-08 15:55:00 +00:00
Robert Speicher
c14d37a334
Merge branch 'dm-remove-double-project-nav-bar' into 'master'
...
Don't show double nav bar on project page when activity is the default project view
Closes #29096
See merge request !9798
2017-03-08 15:42:55 +00:00
Pawel Chojnacki
507c2d38a0
Update GITLAB_SHELL_VERSION to 5.0.0
...
Related to gitlab-ee#1648
2017-03-08 15:07:35 +01:00
Rémy Coutable
1602902987
Merge branch 'sh-speed-up-refresh-service' into 'master'
...
Speed up MergeRequest::RefreshService spec by combining examples
See merge request !9801
2017-03-08 13:18:26 +00:00
Sean McGivern
b51e4cb358
Merge branch 'fix/29093' into 'master'
...
Fix 'Object not found - no match for id (sha)' when importing GitHub PRs
Closes #29093
See merge request !9751
2017-03-08 12:56:17 +00:00
Rémy Coutable
685e261f0a
Merge branch '26188-tag-creation-404-for-guests' into 'master'
...
Don't show links to tag a commit for non permitted users
Closes #26188
See merge request !8407
2017-03-08 12:23:53 +00:00
Clement Ho
e78a366925
Merge branch 'settings-tab' into 'master'
...
Removed the settings gear button inside the project view to a tab
Closes #26733
See merge request !9786
2017-03-08 09:00:22 +00:00
Stan Hu
ccaf66b8cc
Speed up MergeRequest::RefreshService spec by combining examples
2017-03-08 00:39:56 -08:00
Alfredo Sumaran
bd1d778168
Merge branch 'filtered-search-visual-tokens-improvements' into 'master'
...
Filtered Search Visual Tokens code improvements
See merge request !9781
2017-03-08 08:02:42 +00:00
Alfredo Sumaran
cb19fd140f
Merge branch 'add-changelog-filtered-search-visual-tokens' into 'master'
...
Add changelog for filtered-search-visual-tokens
See merge request !9799
2017-03-08 07:33:20 +00:00
Alfredo Sumaran
02e4047480
Merge branch 'fix-fs-edit-dropdown' into 'master'
...
Fix filtered search visual token editing dropdown
See merge request !9794
2017-03-08 07:32:41 +00:00
Alfredo Sumaran
ed49a8e356
Merge branch 'fix-edit-last-visual-token' into 'master'
...
Fix edit last visual token
See merge request !9791
2017-03-08 07:31:54 +00:00
Achilleas Pipinellis
b87d5c883a
Merge branch 'update_crowd_docs' into 'master'
...
Move and update Crowd authentication documentation
See merge request !9775
2017-03-08 07:26:01 +00:00
Alfredo Sumaran
94139a64a2
Merge branch 'filtered-search-visual-tokens' into 'master'
...
Filtered search visual tokens
Closes #26652
See merge request !8969
2017-03-08 07:25:42 +00:00
Achilleas Pipinellis
ca99f3f386
Merge branch 'patch-15' into 'master'
...
Add configuration instructions for Container Registry Notifications.
See merge request !9500
2017-03-08 07:15:22 +00:00
Jose Ivan Vargas
69b4ec954e
fixed user_access_request_spec
2017-03-07 23:26:57 -06:00
Jose Ivan Vargas
ceec350437
Fixed changelog and a haml condition project.html.haml
2017-03-07 23:26:57 -06:00
Jose Ivan Vargas
4739e4a7f0
Fixed some typos inside the _project.html.haml partial
2017-03-07 23:26:57 -06:00
Jose Ivan Vargas
6a48714b83
Added MR number to changelog
2017-03-07 23:26:57 -06:00
Jose Ivan Vargas
3225fd3688
Removed the settings gear button inside the Project to a tab
2017-03-07 23:26:57 -06:00
Clement Ho
64b5829238
Add changelog for filtered-search-visual-tokens
2017-03-07 23:25:17 -06:00
Clement Ho
dfd0e10072
Fix edit last visual token
2017-03-07 23:18:47 -06:00
Clement Ho
de87b94d11
Fix filtered search visual token editing dropdown
2017-03-07 23:17:58 -06:00
Clement Ho
af178560c0
Code improvements
2017-03-07 23:16:07 -06:00
Clement Ho
f44fb5cfd0
Add filtered search visual tokens
2017-03-07 23:10:32 -06:00
Douwe Maan
b5cb1115f4
Merge branch 'rs-fix-todo-service-spec' into 'master'
...
Fix transient failure in TodoService spec
See merge request !9797
2017-03-08 05:05:37 +00:00
Douwe Maan
04665e938c
Merge branch 'issue_16834'
...
# Conflicts:
# doc/api/v3_to_v4.md
2017-03-07 22:00:23 -06:00
Douwe Maan
2906278f93
Don't show double nav bar on project page when activity is the default project view
2017-03-07 21:55:30 -06:00
Robert Speicher
c52b6c2a79
Fix transient failure in TodoService spec
...
For reasons unknown, the lack of `and_call_original` on this message
expectation was causing a transient failure depending on test order. We
narrowed it down using `rspec --bisect` to the following order:
spec/requests/openid_connect_spec.rb:123 spec/services/todo_service_spec.rb:751
2017-03-07 22:39:17 -05:00
Douwe Maan
e53fa9605a
Merge branch 'dm-nested-groups-go-get' into 'master'
...
Fix go-get support for projects in nested groups
See merge request !9793
2017-03-08 03:20:04 +00:00
Douwe Maan
ff9267a707
Merge branch '1381-present-commits-pagination-headers-correctly' into 'master'
...
GET "projects/:id/repository/commits" endpoint improvements
Closes #1381 and #20207
See merge request !9679
2017-03-08 03:05:24 +00:00
Douwe Maan
e17bc3afc5
Merge branch 'clear-connections-before-starting-sidekiq' into 'master'
...
Clear AR connections before starting Sidekiq
Closes gitlab-com/infrastructure#1139
See merge request !9773
2017-03-08 02:00:53 +00:00
Douwe Maan
99b9fbb9e6
Merge branch 'tc-api-v4-doc-changes' into 'master'
...
API v4 doc changes
See merge request !9723
2017-03-08 02:00:30 +00:00
Douwe Maan
9b2e827353
Merge branch 'tc-api-pipeline-jobs' into 'master'
...
API: Get list of jobs for a pipeline
Closes #26843
See merge request !9727
2017-03-08 01:59:16 +00:00
Oswaldo Ferreira
d13451cd49
Returns correct header data for commits endpoint
2017-03-07 22:56:31 -03:00
George Andrinopoulos
c46f933bb7
Fix pagination headers for repository commits api endpoint
2017-03-07 22:56:31 -03:00
Jordan Ryan Reuter
473cab818a
Manually set total_count when paginating commits
...
`Kaminari.paginate_array` takes some options, most relevant of which is
a `total_count` parameter. Using the `commit_count` for `total_count`
lets us correctly treat the return of `Repository#commits` as a subset
of all the commits we may wish to list.
Addition of a new `Repository#commit_count_for_ref` method was
necessarry to allow the user to start from an arbitrary ref.
Ref #1381
2017-03-07 22:56:30 -03:00
Douwe Maan
359f04e8a1
Fix go-get support for projects in nested groups
2017-03-07 19:40:19 -06:00
Felipe Artur
a61bb7cda3
Remove unecessary endpoint from repository, add compatibility endpoints for v3 and several improvements
2017-03-07 22:20:38 -03:00
Alexandre Gomes
b32cd32d07
Add configuration instructions for Container Registry Notifications.[ci skip]
2017-03-07 22:15:45 -03:00
Douwe Maan
2995f48ef3
Merge branch 'orderable-issues' into 'master'
...
Allow issues in boards to be ordered
Closes #21264
See merge request !8916
2017-03-08 01:03:31 +00:00
Felipe Artur
9053d78e74
Update API endpoints for raw files
2017-03-07 21:15:47 -03:00
Yorick Peterse
fb697e69f2
Clear AR connections before starting Sidekiq
...
This should ensure that connections obtained before starting Sidekiq are
not leaked, leading to connection timeouts.
Fixes gitlab-com/infrastructure#1139
2017-03-08 00:25:59 +01:00
Toon Claes
ed6afb35e1
API V4 is no longer in Beta
...
And V4 is the preferred version to be used, because V3 will be removed
in 9.4 (or later).
2017-03-07 23:53:36 +01:00
Toon Claes
13c3f622cb
Update description about GET /projects endpoint
...
It returns all projects visible for the authenticated user, not just
the project they are member of.
2017-03-07 23:53:36 +01:00
Douwe Maan
8a199f324b
Remove unneccessary blank lines
2017-03-07 16:45:41 -06:00
Toon Claes
ae9218a7fd
Remove user_can_download_artifacts
...
It was actually not used anywhere.
2017-03-07 23:45:32 +01:00
Toon Claes
901fbda67c
Make it possible to query scope as scope[]=
...
Since issues also accepts the query parameter iids[]=, also make it
possible query scope like that.
2017-03-07 23:45:32 +01:00
Toon Claes
f372400673
Add GET /projects/:id/pipelines/:pipeline_id/jobs endpoint
...
Add endpoint to get the jobs scoped to a pipeline.
2017-03-07 23:45:32 +01:00