Douwe Maan
00906b5bb6
Merge branch 'issue_12758' into 'master'
...
Implement custom notification level options
part of #12758
See merge request !4389
2016-06-17 23:28:22 +00:00
Z.J. van de Weg
e0bdcd2f2f
fixup! updated docs for api endpoint award emoji
2016-06-17 22:03:57 +02:00
Z.J. van de Weg
05a4a586b5
Add endpoints for award emoji on notes
...
Docs also added.
2016-06-17 21:02:51 +02:00
Z.J. van de Weg
3f88221c2d
Add endpoints for Award Emoji
...
This only supports Issues and MergeRequests right now because of the
consistency of the routes those models provide.
2016-06-17 20:07:17 +02:00
Felipe Artur
e5aa902860
Merge master into issue_12758
2016-06-17 14:29:11 -03:00
Patricio Cano
8ad1884505
Fixed Rubocop error
2016-06-17 11:16:25 -05:00
Felipe Artur
33c61bd461
Re-use notifications dropdown/modal for user profile
2016-06-17 00:17:20 -03:00
Timothy Andrew
9d7cda3ddc
Fix api_helpers_spec
2016-06-16 12:28:31 +05:30
Timothy Andrew
90bba2bc46
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
2016-06-16 08:27:37 +05:30
Kamil Trzcinski
1b62b86fdd
Merge remote-tracking branch 'origin/master' into artifacts-expire-date
2016-06-14 11:38:44 +02:00
Timothy Andrew
d0bcba1105
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
2016-06-14 09:06:53 +05:30
Douglas Barbosa Alexandre
b56c456750
Project members with guest role can't access confidential issues
2016-06-13 19:32:00 -03:00
Felipe Artur
dc2ca59433
Expose notification setting events in API
2016-06-13 15:51:11 -03:00
Kamil Trzcinski and Phil Hughes
421be01dab
Improve design based on review
2016-06-13 11:09:19 +01:00
Kamil Trzcinski and Phil Hughes
6013768fec
Added keep artifacts API endpoint
2016-06-13 11:07:23 +01:00
Stan Hu
a85dde9182
Fix Error 500 when using closes_issues API with an external issue tracker
...
Closes #18484
2016-06-11 19:50:08 -07:00
Rémy Coutable
5324c93643
Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergeable_ci_state?
...
The logic of the method was obviously inverted.
Signed-off-by: Rémy Coutable <remy@rymai.me >
2016-06-10 14:37:32 +02:00
Rémy Coutable
6dff7c1771
Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb' feature
...
Based on the feedback from reviewers.
Signed-off-by: Rémy Coutable <remy@rymai.me >
2016-06-10 14:36:57 +02:00
Rui Anderson and Rémy Coutable
07dbd6b388
Allow or not merge MR with failed build
...
Signed-off-by: Rémy Coutable <remy@rymai.me >
2016-06-10 14:36:54 +02:00
Timothy Andrew
1779d68bfe
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
2016-06-09 14:40:14 +05:30
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
Kamil Trzcinski
7ad7e10fee
Merge remote-tracking branch 'origin/master' into rename-ci-commit
2016-06-06 11:20:17 +02:00
Kamil Trzcinski
9614c52266
Fix tests offenses: use pipeline of Ci::Build and rename views
2016-06-06 11:19:54 +02:00
Kamil Trzcinski
836061ddfd
Rename remaining ci_commits in specs
2016-06-03 16:28:15 +02:00
Kamil Trzcinski
20c7144ed2
Rename all [ci_]commit to [ci_]pipeline in specs and features
2016-06-03 16:22:26 +02:00
Kamil Trzcinski
8ce1896b46
Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commit
...
* commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9':
Let contributors know where to start
Ensure branch cleanup regardless of whether the import process succeeds
Fix failing todo tests
Reorder the todos because the use of the project finder attempts to order them differently
Update target todo test to use a public project
Use the project finder in the todos finder to limit todos to just ones within projects you have access to.
Move filtering todos by projects not pending deletion into a scope on the todo model
Reduce the filters on the todos joins project query by being explicit about the join
Ensure we don't show TODOS for projects pending delete
Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb
Remove unused Issuable#is_assigned? method
fixup! Don't allow merges with new commits
fixup! Add `sha` parameter to MR accept API
Reduce Namespace queries in UserReferenceFilter
Added ReferenceFilter#nodes
Returning enums in ReferenceFilter#each_node
Don't allow merges with new commits
Add `sha` parameter to MR accept API
2016-06-03 15:53:26 +02:00
Z.J. van de Weg
9d491712cf
Merge branch 'master' into awardables
2016-06-03 15:20:11 +02:00
Kamil Trzcinski
08baa9983e
Use pipelines in context of Project
2016-06-03 13:34:03 +02:00
Kamil Trzcinski
717fdd6d42
Rename Ci::Build commit to pipeline
2016-06-03 12:29:00 +02:00
Timothy Andrew
ae0d8222af
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
2016-06-03 09:31:16 +05:30
Kamil Trzcinski
021d3810c3
Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline
2016-06-02 16:59:04 +02:00
Sean McGivern
d863d86aeb
Add sha parameter to MR accept API
...
The `sha` parameter is optional, and when present, must match the
current HEAD SHA of the source branch. Otherwise, the API call fails
with a 409 Conflict and a message containing the current HEAD for the
source branch.
Also tidy up some doc wording.
2016-06-01 20:29:54 +01:00
Rémy Coutable
46ac3107a4
Merge branch 'issue_15557' into 'master'
...
Fix error 500 when sorting issues by milestone due date and filtering by labels
fixes #15557
See merge request !4327
2016-06-01 08:42:36 +00:00
Felipe Artur
56f3b243ce
Add leading comment space cop
2016-05-31 19:33:46 -03:00
ZJ van de Weg
cbd7801b3d
Merge branch 'master' into awardables
2016-05-30 18:54:08 +02:00
Grzegorz Bizon and Robert Speicher
1bcb1ef85e
Update specs for creating new note without access
2016-05-29 15:03:00 -04:00
Douwe Maan
9971782200
Merge branch 'fix-issue-17496' into 'master'
...
Fix groups API to list only user's accessible projects
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17496
See merge request !1966
2016-05-25 20:28:17 +00:00
ZJ van de Weg
7ae536002a
Merge branch 'master' into awardables
2016-05-25 14:41:25 +02:00
Stan Hu
b359d5d57f
Fix groups API to list only user's accessible projects
...
Closes #17496
2016-05-24 18:14:12 -07: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
Connor Shea
2bf818c4d0
Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value.
2016-05-22 19:50:49 -06:00
Zeger-Jan van de Weg and Alfredo Sumaran
79620c501d
Update API and fetching task
2016-05-20 15:58:36 -05:00
Zeger-Jan van de Weg and Alfredo Sumaran
e166a8022a
Backend for a gitignores dropdown
2016-05-20 15:58:36 -05:00
Grzegorz Bizon
da8b72d453
Extend runner options that are configurable via API
2016-05-19 22:01:53 +02: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
Rémy Coutable
da8ac1635f
Merge branch 'issue_17302' into 'master'
...
Fix api leaking notes when user is not authorized to read noteable
fixes #17302
See merge request !4102
2016-05-18 04:31:12 +00:00
Felipe Artur
c9be74e247
Fix single note api request
2016-05-16 16:43:19 -03:00
Gabriel Mazetto
f5a0ac0fc1
Codestyle: make sure we have space around operators
2016-05-13 04:46:56 -03:00
Ahmad Sherif
0c22698bd4
Add API endpoints for un/subscribing from/to a label
...
Closes #15638
2016-05-12 22:48:09 +02:00
Zeger-Jan van de Weg
4558b5b9fe
Incorporate feedback
2016-05-11 22:43:58 +02:00
Douwe Maan
Z.J. van de Weg
Felipe Artur
Patricio Cano
Timothy Andrew
Kamil Trzcinski
Douglas Barbosa Alexandre
Stan Hu
Rémy Coutable
Rui AndersonandRémy Coutable
Sean McGivern
Grzegorz BizonandRobert Speicher
Connor Shea
Fatih Acet
Gabriel Mazetto
Ahmad Sherif