Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make `project_id` and `environment_id` nullableenvironments-and-deployments | Kamil Trzcinski | 2016-06-15 | 1 | -0/+2 |
| | | | | | This is done to make belongs_to with required to properly validate association. Otherwise `ActiveRecord::StatementInvalid` is raised. | ||||
* | Properly create a new deployment after build success | Kamil Trzcinski | 2016-06-14 | 1 | -4/+62 |
| | |||||
* | Add specs for models and services | Kamil Trzcinski | 2016-06-14 | 1 | -0/+59 |
| | |||||
* | Project members with guest role can't access confidential issues | Douglas Barbosa Alexandre | 2016-06-13 | 3 | -4/+37 |
| | |||||
* | Remove notification level fild from users, improve migrations and specsissue_3359_2 | Felipe Artur | 2016-06-10 | 1 | -3/+4 |
| | |||||
* | Remove notification level from user model | Felipe Artur | 2016-06-10 | 1 | -10/+286 |
| | |||||
* | Toggling a task in a description with mentions doesn't creates a Todo | Douglas Barbosa Alexandre | 2016-06-09 | 1 | -2/+28 |
| | |||||
* | Make Omniauth providers specs to not modify global configuration | Kamil Trzcinski | 2016-06-08 | 1 | -1/+1 |
| | |||||
* | Fix remaining test offensesrename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-07 | 1 | -7/+7 |
| | |||||
* | Fix tests failures | Kamil Trzcinski | 2016-06-07 | 1 | -35/+35 |
| | |||||
* | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 5 | -83/+294 |
|\ | | | | | | | | | | | # Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb | ||||
| * | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 5 | -83/+294 |
| |\ | |||||
| | * | Fix spec | Alfredo Sumaran | 2016-06-03 | 1 | -6/+7 |
| | | | |||||
| | * | Spec label add / delete in UpdateService | Sean McGivern | 2016-06-03 | 1 | -0/+46 |
| | | | |||||
| | * | Allow bulk-updating to remove all labels | Sean McGivern | 2016-06-03 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | 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`). | ||||
| | * | Update CHANGELOG | Alfredo Sumaran | 2016-06-03 | 1 | -1/+1 |
| | | | |||||
| | * | Tidy up BulkUpdateService specs | Sean McGivern | 2016-06-03 | 1 | -103/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]]` | ||||
| | * | fixup! WIP: allow adding and removing labels in bulk | Sean McGivern | 2016-06-03 | 1 | -0/+148 |
| | | | |||||
| | * | Merge branch 'master' into awardablesawardables | Z.J. van de Weg | 2016-06-03 | 4 | -42/+40 |
| | |\ | |||||
| | * | | Move awardables too when issue is moved | Z.J. van de Weg | 2016-06-01 | 1 | -0/+5 |
| | | | | |||||
| | * | | Merge branch 'master' into awardables | ZJ van de Weg | 2016-05-30 | 9 | -62/+54 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into awardables | ZJ van de Weg | 2016-05-25 | 11 | -21/+221 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 2 | -34/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix latests concerns | ZJ van de Weg | 2016-05-18 | 2 | -34/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 3 | -10/+56 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 3 | -6/+222 |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb | ||||
| | * | | | | | | Fix tests and wrong choices during merge | Zeger-Jan van de Weg | 2016-05-12 | 2 | -8/+14 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into awardables | Zeger-Jan van de Weg | 2016-05-11 | 15 | -61/+464 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Add tests on Awardables and Award Emoji | Zeger-Jan van de Weg | 2016-05-10 | 3 | -20/+56 |
| | | | | | | | | | |||||
* | | | | | | | | | Rename remaining ci_commits in specs | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features | Kamil Trzcinski | 2016-06-03 | 7 | -50/+49 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commit | Kamil Trzcinski | 2016-06-03 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | | | | | Merge branch '13313-fix-deprecation-warnings' into 'master' | Robert Speicher | 2016-06-03 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Fixes #13313. See merge request !4441 | ||||
| | * | | | | | | | Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb13313-fix-deprecation-warnings | Rémy Coutable | 2016-06-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | Fix other places where we still use commit attribute of Build | Kamil Trzcinski | 2016-06-03 | 2 | -20/+20 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix more places where we should rename ci_commit to pipeline | Kamil Trzcinski | 2016-06-03 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Use pipelines in context of Project | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | fix import service spec | James Lopez | 2016-06-02 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Rename Ci::Build commit to pipeline | Kamil Trzcinski | 2016-06-03 | 3 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline | Kamil Trzcinski | 2016-06-02 | 2 | -8/+8 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'current-settings-use-request-store-during-request' | Douwe Maan | 2016-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update tests for the current_application_settings request store changes | DJ Mountney | 2016-05-27 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Fix rubocop offenses | Kamil Trzcinski | 2016-05-31 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Test token expirability | Kamil Trzcinski | 2016-05-31 | 1 | -0/+15 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch ↵ | Stan Hu | 2016-05-31 | 1 | -29/+17 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 | ||||
| * | | | | | | | | Make authentication service for Container Registry to be compatible with < ↵make-container-registry-authentication-service-compatible-with-older-docker | Kamil Trzcinski | 2016-05-30 | 1 | -29/+17 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Docker 1.11 | ||||
* | | | | | | | | Enable Performance/TimesMap Rubocop coprubocop/enable-performance-times-map-cop | Grzegorz Bizon | 2016-05-30 | 1 | -7/+2 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Array.new with a block instead of `.times.collect` / `.times.map`. See #17478 | ||||
* | | | | | | | Update specs to carry out changes in note factory | Grzegorz Bizon | 2016-05-29 | 2 | -7/+15 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'remove-main-language' into 'master' | Josh Frye | 2016-05-26 | 1 | -43/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove main_language and tests. Closes #14937 See merge request !4293 |