Commit Graph
564 Commits
Author SHA1 Message Date
Kamil Trzcinski 13d941e185 Make Omniauth providers specs to not modify global configuration 2016-06-08 16:50:05 +02:00
Kamil Trzcinski 8988c8743d Fix remaining test offenses 2016-06-07 13:14:37 +02:00
Kamil Trzcinski dbf235f514 Fix tests failures 2016-06-07 10:25:57 +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
Kamil Trzcinski 7ad7e10fee Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-06 11:20:17 +02:00
Alfredo Sumaran 7df4a3c53a Fix spec 2016-06-03 17:14:23 -05:00
Sean McGivernandAlfredo Sumaran 071ad63630 Spec label add / delete in UpdateService 2016-06-03 17:14:23 -05:00
Sean McGivernandAlfredo Sumaran 165d799fb3 Allow bulk-updating to remove all labels
Instead of passing `remove_label_ids`, just pass an empty array for
`label_ids` (and don't pass `add_label_ids` or `remove_label_ids`).
2016-06-03 17:14:23 -05:00
Alfredo Sumaran d78fd6df0c Update CHANGELOG 2016-06-03 17:14:23 -05:00
Sean McGivernandAlfredo Sumaran 0fcf6e1094 Tidy up BulkUpdateService specs
1. Don't use instance variables, use `let` instead.
2. Add descriptions for all specs.
3. Share variables where possible.
4. Give labels more vivid names than 1, 2, and 3.
5. Remove deprecation warnings by passing issue IDs as '1,2,3' instead
   of an array, as that's how they're passed by the front-end. (The
   deprecation warning is for passing a nested array, which is what
   happens if an actual array is passed, as:
     `[1, 2, 3].split(',') == [[1, 2, 3]]`
2016-06-03 17:14:23 -05:00
Sean McGivernandAlfredo Sumaran ac40843c94 fixup! WIP: allow adding and removing labels in bulk 2016-06-03 17:11:41 -05: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
Kamil Trzcinski 9423547f61 Fix other places where we still use commit attribute of Build 2016-06-03 15:49:14 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Kamil Trzcinski 4d5f7aa008 Fix more places where we should rename ci_commit to pipeline 2016-06-03 14:46:17 +02: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
Kamil Trzcinski 08baa9983e Use pipelines in context of Project 2016-06-03 13:34:03 +02:00
Kamil Trzcinski 0a51c95464 Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-03 13:10:01 +02:00
Kamil Trzcinski 717fdd6d42 Rename Ci::Build commit to pipeline 2016-06-03 12:29:00 +02:00
James LopezandRobert Speicher d9df05e143 fix import service spec 2016-06-02 21:48:27 -04: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
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
Z.J. van de Weg fab695461a Move awardables too when issue is moved 2016-06-01 18:33:49 +02:00
Douwe Maan 4a50e1f051 Merge branch 'current-settings-use-request-store-during-request' 2016-06-01 12:55:00 +02:00
Kamil Trzcinski f27daddfc6 Fix rubocop offenses 2016-05-31 15:38:42 +02:00
Kamil Trzcinski 7a6ba30d9a Test token expirability 2016-05-31 13:48:21 +02:00
Stan Hu 9951243bf4 Merge branch 'make-container-registry-authentication-service-compatible-with-older-docker' into 'master'
Make authentication service for Container Registry to be compatible with < Docker 1.11

This removes the usage of `offline_token` which is only present when using `Docker 1.11.x` instead we relay on `scope`. This should make it compatible with any client starting from 1.6 (I did test only 1.8 and up).

Right now we return 403 if unauthorized user doesn't have access to anything. In all other cases we return token, but with empty `access`, which simply disallow requested action.



See merge request !4363
2016-05-31 03:18:33 +00:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Kamil Trzcinski 7ec1fa212d Make authentication service for Container Registry to be compatible with < Docker 1.11 2016-05-30 16:57:39 +02:00
Grzegorz Bizon 0c6f04427b Enable Performance/TimesMap Rubocop cop
Use Array.new with a block instead of `.times.collect` / `.times.map`.

See #17478
2016-05-30 14:21:26 +02:00
Grzegorz BizonandRobert Speicher e558edd1ce Update specs to carry out changes in note factory 2016-05-29 15:03:00 -04:00
DJ Mountney 7d57b11093 Update tests for the current_application_settings request store changes 2016-05-27 19:05:52 -07:00
Josh Frye 85495c8c85 Merge branch 'remove-main-language' into 'master'
Remove main_language and tests. Closes #14937



See merge request !4293
2016-05-26 14:49:25 +00:00
Josh Frye 6d2a0a6b9b Remove main_language and tests 2016-05-25 17:16:42 -04:00
Douwe Maan 74fb500415 Merge branch 'issue_10725' into 'master'
Fix forks creation when visibility level is restricted

fixes #10725

See merge request !4283
2016-05-25 20:47:46 +00:00
Felipe Artur 5273335247 Fix forks creation when visibility level is restricted 2016-05-25 10:57:00 -04: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
Kamil TrzcinskiandGrzegorz Bizon 646018a40e Fix the CI login to Container Registry (the gitlab-ci-token user) 2016-05-23 00:34:51 +02:00
Kamil Trzcinski 4474eab4f6 Fix container deletion permission issue 2016-05-20 18:43:11 -05:00
Douwe Maan baccd1838c Merge branch 'rm-source-branch' into 'master'
Allows MR authors to have the source branch removed when merging the MR


closes #13191 

The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously.

Screenshot:
![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png)

See merge request !2801
2016-05-20 21:41:02 +00:00
Douwe Maan fc1910ddc5 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts:
#	app/services/system_note_service.rb
2016-05-20 16:23:04 -05: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
Jeroen Jacobs 7880a300dc Allows MR authors to have the source branch removed when merging the MR 2016-05-20 11:30:03 +02:00
Felipe Artur 6fb9bf87c4 Use the right default notification settings for non members 2016-05-19 19:47:07 -04:00
Douwe Maan 3f6f2bbe14 Merge branch 'create-todo-on-failing-build' into 'master'
Create a todo on failing MR build

Implements #14067. I worked on this with @DouweM (any mistakes are mine).

When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything.

Current limitations:
- This isn't configurable by project.
- The author of a merge request might not be the person who pushed the breaking commit.
- I haven't tested this with a working CI setup, just with the unit tests below and by modifying my DB directly.


See merge request !3177
2016-05-19 21:18:22 +00:00
Robert Speicher bbf0a04f5e Merge branch 'mooreniemi/gitlab-ce-issue_15236' into 'master'
Changing the confidentiality of an issue now creates a new system note

Closes #15236.

See merge request !4189
2016-05-19 16:27:09 +00:00