home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,470 Commits 48 Branches 340 Tags
a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58
Commit Graph
122 Commits
Author SHA1 Message Date
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master' 
Ability to prioritize labels

Closes #14189 

See merge request !4009
 2016-06-07 15:15:07 +00:00
Sean McGivern ee26c3cab4 Fix label order by priority on labels page 2016-06-07 14:01:30 +01:00
Jacob Vosmaer (GitLab) afa21054fa Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 
Workhorse to serve raw diffs

Fixes (partially) #13999

Dependent on: gitlab-org/gitlab-workhorse!45

See merge request !4130
 2016-06-07 12:50:29 +00:00
Kamil Trzcinski 4e38d88df5 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-06 20:24:21 +02:00
Kamil Trzcinski 842f0a3401 Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 
# Conflicts:
#	features/steps/shared/builds.rb
#	spec/requests/ci/api/builds_spec.rb
 2016-06-06 11:21:39 +02:00
Z.J. van de Weg 7d3f8f542f Update tests on wording 2016-06-06 11:10:10 +02:00
ZJ van de Weg 2f9c2149a3 Backend awardables on comments 2016-06-06 11:03:39 +02:00
Zeger-Jan van de Weg 01e1139f68 Workhorse to serve raw diffs 2016-06-03 18:43:22 +02:00
Kamil Trzcinski 20c7144ed2 Rename all [ci_]commit to [ci_]pipeline in specs and features 2016-06-03 16:22:26 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02: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
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
Sean McGivern f680eca912 Don't allow merges with new commits 
Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
the source branch when the form is submitted, show a warning (like with
a merge conflict) and don't merge the branch.
 2016-06-01 20:34:41 +01:00
Z.J. van de Weg 91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Grzegorz Bizon c370dce01c Enable Style/RedundantParentheses rubocop cop 
See #17478
 2016-05-30 15:07:18 +02:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses 
Also removes the note from the development/testing.md guide
 2016-05-24 15:40:29 -04:00
Robert Speicher 3ba72f69af Enable Style/SpaceAroundKeyword cop and fix offenses 2016-05-23 14:16:35 -04:00
Douwe Maan a97cb8f8b8 Merge branch 'issue_9013' into 'master' 
Let users set notification levels in projects which they are not members

Fixes #9013 

See merge request !3986
 2016-05-20 21:04:55 +00:00
Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb
 2016-05-18 13:05:53 -05:00
Dmitriy Zaporozhets 253a017b01 Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-18 12:48:23 -05:00
Felipe Artur 07ff874f57 Let users set notification levels in projects which they are not members 2016-05-17 21:53:03 -05:00
Zeger-Jan van de Weg 7a4e7ad04e Fix tests and wrong choices during merge 2016-05-12 09:23:21 +02:00
Zeger-Jan van de Weg 4558b5b9fe Incorporate feedback 2016-05-11 22:43:58 +02:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Zeger-Jan van de Weg dccf8a9fc8 Add tests on Awardables and Award Emoji 2016-05-10 12:03:13 +02:00
Grzegorz Bizon c9577711ce Handle issue move access instead of raising error 
Closes #15533
 2016-04-30 21:28:40 +02:00
Rémy Coutable 5a8873f362 Merge branch 'rs-diff_view' into 'master' 
Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732
 2016-04-22 07:49:46 +00:00
Rémy Coutable 338f6f0902 Merge branch 'issue_5838' into 'master' 
Show project members only for members

fixes #5838 

See merge request !3752
 2016-04-21 10:31:20 +00:00
Felipe Artur 9581aba4d4 Add changelog entry and fix convention in a spec 2016-04-20 12:41:35 -03:00
Robert Speicher 8530ce4c6f Clarify that the diff view setting always comes from the cookie 
This invalidates one test, which we've removed.
 2016-04-19 17:47:58 -04:00
Grzegorz Bizon f2e3868124 Check permissions when sharing project with group 
Closes #15330
 2016-04-19 12:15:56 +02:00
Felipe Artur 0b91ff287d Projects members tab should follow visibility levels 2016-04-18 17:53:34 -03:00
Felipe Artur 62f6601c59 Show project members only for members 2016-04-18 17:53:34 -03:00
Rémy Coutable 8ea6c6d80c Merge branch 'issue_15044' into 'master' 
Allow to close invalid merge request

fixes #15044

See merge request !3664
 2016-04-13 09:10:57 +00:00
Felipe Artur a64f1c7636 Add changelog entry, improve specs and model code 2016-04-12 15:52:03 -03:00
Douglas Barbosa Alexandre 61a62e00e3 Fix specs for Projects::NotificationSettingsController 2016-04-12 12:57:39 -03:00
Douglas Barbosa Alexandre aabb466e5b Improve specs for group/project notification controller 2016-04-12 12:10:59 -03:00
Douglas Barbosa Alexandre bee28e1785 Requires user to be signed in when changing notification settings 2016-04-11 20:50:26 -03:00
Felipe Artur 476cf23fc3 Allow to close invalid merge request 2016-04-11 19:00:59 -03:00
Stan Hu 924e4b3700 Return status code 303 after a branch DELETE operation to avoid project deletion 
Closes #14994
 2016-04-06 21:11:10 -07:00
Grzegorz Bizon bb9c194c23 Respond 404 when unauthorized user imports members 2016-04-05 14:37:06 +02:00
Grzegorz Bizon c52b5c92fb Do not leak project exists when importing members 
When importing members, and user does not have permissions to read
members in a source project, do not leak information about source
project existence. Notifiy user that project has not been found instead.
 2016-04-05 13:55:15 +02:00
Grzegorz Bizon b248ee9381 Check permissions when importing project members 
Closes #14899
 2016-04-05 13:32:28 +02:00
Gabriel Mazetto 808bcf5bc6 Fixed MergeRequestController spec 2016-03-30 00:02:32 -03:00
Rémy Coutable f4bdefdff1 Ensure private project snippets are not viewable by unauthorized people 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
 2016-03-25 12:33:42 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Zeger-Jan van de Weg d28a587e82 Fix typos and denting 2016-03-21 19:30:45 +01:00