home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,105 Commits 48 Branches 340 Tags
9440ac669ff1fcb37404094cd73e2e038c141ae0
Commit Graph
29105 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Schatz 9440ac669f Merge branch 'awardables' into 'master' 
Awardables

TODO:
- [x] Fix specs
- [x] Write new specs
- [X] Check if the migrations can stay offline migrations -- (seems not to make 8.8)
- [X] API expose Awards -> Next merge window

See merge request !3785
 2016-06-03 16:09:57 +00:00
Dmitriy Zaporozhets 2444f3ea7a Merge branch 'dz-rename-registry-tab' into 'master' 
Shorter name for Container Registry tab

cc @markpundsack @jschatz1 

Based on https://gitlab.com/gitlab-org/gitlab-ce/issues/17983#note_12208183

See merge request !4430
 2016-06-03 15:21:28 +00:00
Z.J. van de Weg 77d4d5e3a6 🚓 2016-06-03 16:35:56 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Douwe Maan ca3c5c295e Merge branch 'patch-1' into 'master' 
Let contributors know where to start

Needed becuase: https://gitlab.com/gitlab-org/gitlab-ce/issues/14905#note_12235996

See merge request !4455
 2016-06-03 12:43:48 +00:00
Douwe Maan 3c713de0c4 Merge branch 'gh-branch-cleanup' into 'master' 
Ensure branch cleanup regardless of whether the GitHub import process succeeds

Closes #17766


See merge request !4450
 2016-06-03 12:43:12 +00:00
Douwe Maan 0e2490c0cb Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' 
Resolve "SHA parameter in accept merge request API"

Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged.

Also add the same parameter to the UI:

![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif)

@DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh 😃

Closes #14139.

See merge request !4414
 2016-06-03 12:41:58 +00:00
Douwe Maan 4c8d4c620c Merge branch 'banzai-user-filter-queries' 2016-06-03 14:35:49 +02:00
Douwe Maan 7049912526 Merge branch 'todos-filter-project-delete' into 'master' 
Ensure we don't show TODOS for projects pending delete

## What does this MR do?

Joins the todos on the projects table in order to run the default scope. Also includes a where clause because the default scope is being removed soon.

## Are there points in the code the reviewer needs to double check?

An alternative approach, more like the Issues page, would be to filter down the list by passing user.authorized_projects into the where clause.

Or we could just be more defensive in the view when iterating.

## Why was this MR needed?

Todos page throws 500 error for users with todos in a project pending deletion.

## What are the relevant issue numbers?

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813

cc\ @stanhu 

See merge request !4300
 2016-06-03 12:33:41 +00:00
Robert Speicher 1637e178b8 Merge branch '13313-fix-deprecation-warnings' into 'master' 
Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb

Fixes #13313.

See merge request !4441
 2016-06-03 11:55:01 +00:00
Robert Speicher 6eda07b717 Merge branch '13312-remove-issuable-is_assigned' into 'master' 
Remove unused Issuable#is_assigned? method

Fixes #13312.

See merge request !4440
 2016-06-03 11:45:05 +00:00
Zeger-Jan van de Weg 7cc897d74e Let contributors know where to start 
gitlab-org/gitlab-ce/issues/14905#note_12235996
 2016-06-03 09:16:45 +00:00
Dmitriy Zaporozhets 3f4ac2ff60 Merge branch 'dz-code-tab' 
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4431
 2016-06-03 11:42:02 +03:00
Dmitriy Zaporozhets 334cb86821 Update test since branch removal does not render template anymore 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets db2109b086 Fix more tests with new Code tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets 7cfb445c15 Update tests to match new Code tab logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets 56a17a7701 Put project Files and Commits tabs under Code tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets ae5f17ae2d Merge branch 'dz-more-ui-guides' into 'master' 
Add icons and buttons to UI guide

cc @jschatz1 @skyruler 

See merge request !4445
 2016-06-03 07:07:52 +00:00
Robert Speicher 07b46517cc Merge branch 'fix/import-error-handling' into 'master' 
Fix import error handling

Fixes https://gitlab.com/gitlab-com/support-forum/issues/745

This improves import error handling:
- Now if there's an error during importing before the job is scheduled, we also mark the project status as failed.
- Refactored setting the status to failed into one single method.
- Fixed some situations where the error message was missing or simply empty.

See merge request !4366
 2016-06-03 03:00:07 +00:00
James LopezandRobert Speicher c9e8acd058 Update repository_import_worker.rb 2016-06-02 21:48:27 -04:00
James LopezandRobert Speicher d9df05e143 fix import service spec 2016-06-02 21:48:27 -04:00
James LopezandRobert Speicher f2ec6341b3 added changelog 2016-06-02 21:48:27 -04:00
James LopezandRobert Speicher 097eafc8c7 fix some issues and improved error output for forking 2016-06-02 21:48:26 -04:00
James LopezandRobert Speicher 64c3905523 some refactoring and fixing spec 2016-06-02 21:48:25 -04:00
James LopezandRobert Speicher b2b3e0e6ee fix empty message on shell error 2016-06-02 21:47:39 -04:00
James LopezandRobert Speicher b2b2b2f9de fix create service error handling - missing setting import status to failed 2016-06-02 21:47:38 -04:00
Douglas Barbosa Alexandre 3b4f03de8f Ensure branch cleanup regardless of whether the import process succeeds 2016-06-02 19:48:11 -03:00
DJ Mountney 86675194aa Fix failing todo tests 2016-06-02 15:30:13 -07:00
DJ Mountney f0ca487cd5 Reorder the todos because the use of the project finder attempts to order them differently 2016-06-02 14:17:46 -07:00
Yorick Peterse 74849f9783 Merge branch '18031-sidebar-labels-queries' into 'master' 
See merge request !4436
 2016-06-02 20:58:57 +00:00
Dmitriy Zaporozhets 94b0da4230 Merge branch 'rs-todo-has-tooltip' into 'master' 
Add tooltips to todo target links



See merge request !4370
 2016-06-02 20:20:18 +00:00
Dmitriy Zaporozhets 814b26cfc3 Fix typo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-02 23:04:08 +03:00
Dmitriy Zaporozhets 33c499441a Add icons and buttons to UI guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-02 22:43:02 +03:00
Paco Guzman 078ba8c090 issuable#labels_array explicitly load the labels 
This will be useful when you want to ask for the 
number of items and later iterate over them, without 
needing to ask if the association is load or not.

So you avoid extra database queries
 2016-06-02 21:43:01 +02:00
DJ Mountney 14a9b0d7dd Update target todo test to use a public project 2016-06-02 12:23:32 -07:00
DJ Mountney b173ea2bd4 Use the project finder in the todos finder to limit todos to just ones within projects you have access to. 2016-06-02 12:20:27 -07:00
DJ Mountney 4280575fc0 Move filtering todos by projects not pending deletion into a scope on the todo model 2016-06-02 11:24:18 -07:00
DJ Mountney 4ecc10fade Reduce the filters on the todos joins project query by being explicit about the join 2016-06-02 11:24:18 -07:00
DJ Mountney c3e923c496 Ensure we don't show TODOS for projects pending delete 
By joining the Todos on the project table.
 2016-06-02 11:24:18 -07:00
Robert Speicher ab75b21c83 Update CHANGELOG for 8.8.3 
[ci skip]
 2016-06-02 13:59:34 -04:00
Robert Speicher 7deb21b626 Merge branch 'issue_18102' into 'master' 
Fixes missing number on generated ordered list

Closes #18102 

See merge request !4437
 2016-06-02 17:15:26 +00:00
Robert Speicher e6389dfee6 Merge branch 'reduce-fog-deps' into 'master' 
Reduce number of fog gem dependencies

Currently supported:

* AWS
* Azure
* OpenStack
* Google
* local storage

Closes #15352

See merge request !4396
 2016-06-02 16:35:42 +00:00
Rémy Coutable 34007aa0dc Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-02 18:25:44 +02:00
Yorick Peterse 61cfda255f Merge branch 'issue-18032' into 'master' 
Cache project build count. Closes #18032

See merge request !4377
 2016-06-02 16:21:49 +00:00
Rémy Coutable 905e8b6b54 Remove unused Issuable#is_assigned? method 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-02 18:14:33 +02:00
Sean McGivern 4f726683cb fixup! Don't allow merges with new commits 2016-06-02 17:00:42 +01:00
Sean McGivern 04fdf4b9a9 fixup! Add sha parameter to MR accept API 2016-06-02 17:00:16 +01:00
Robert Speicher f0d6d71117 Merge branch 'tests/move-shortcuts-specs-to-valid-directory' into 'master' 
Move feature specs for shortcuts to valid directory

This MR moves tests to valid directory that matches our namespace we use in code.

See merge request !4433
 2016-06-02 15:43:13 +00:00
Josh Frye 2605a0a844 Refactor. Add tests. 2016-06-02 11:10:57 -04:00
Josh Frye 4d9622e7d3 Invalidate cache on build change 2016-06-02 11:10:57 -04:00