summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxesPhil Hughes2017-08-033-0/+13
| | | | Closes #35882
* Merge branch '34027-add-icons-to-sidebar' into 'master'Phil Hughes2017-08-0236-56/+185
|\ | | | | | | | | | | | | Add icons to project sidebar Closes #34027 and #35877 See merge request !13204
| * Add icons to project sidebarAnnabel Dunstone Gray2017-08-0236-56/+185
|/
* Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'Rémy Coutable2017-08-023-2/+41
|\ | | | | | | | | Uniquify reserved word usernames on OAuth user creation See merge request !13244
| * Uniquify reserved word usernames on OAuth user creationRobin Bobbitt2017-08-023-2/+41
| |
* | Merge branch 'synchronous_zanata_community_contribution_translation' into ↵Rémy Coutable2017-08-025-252/+294
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Synchronous zanata community contribution translation Closes #35003 See merge request !13242
| * | Synchronous zanata community contribution translation黄涛2017-08-025-252/+294
| | |
* | | Merge branch '35408-group-auto-avatars' into 'master'Filipa Lacerda2017-08-027-2/+141
|\ \ \ | | | | | | | | | | | | | | | | Show auto-generated avatars in Groups dashboard tree for Groups without avatars See merge request !13188
| * | | Remove unnecessary component import and registration35408-group-auto-avatarskushalpandya2017-08-021-2/+0
| | | |
| * | | Use `$mount` for component rendering, remove tests for `props` datatype as ↵kushalpandya2017-08-021-26/+4
| | | | | | | | | | | | | | | | unnecessary
| * | | Use kebab-case for propskushalpandya2017-08-021-2/+2
| | | |
| * | | Remove unnecessary name propertykushalpandya2017-08-021-1/+0
| | | |
| * | | Add changelog entrykushalpandya2017-08-011-0/+4
| | | |
| * | | Prop name update, minor cleanupkushalpandya2017-08-011-6/+8
| | | |
| * | | Import `group_identicon` minor clean up and prop updateskushalpandya2017-08-011-7/+7
| | | |
| * | | Tests for `group_identicon` componentkushalpandya2017-08-011-0/+82
| | | |
| * | | Remove unnecessary importskushalpandya2017-08-011-2/+0
| | | |
| * | | Change ID type to numberkushalpandya2017-08-011-1/+1
| | | |
| * | | Update testskushalpandya2017-07-312-1/+16
| | | |
| * | | Add styles for Identicons for Groupskushalpandya2017-07-311-0/+4
| | | |
| * | | Use GroupIdenticon for missing avatarskushalpandya2017-07-312-0/+15
| | | |
| * | | Group Identicon for groups without avatarskushalpandya2017-07-311-0/+44
| | | |
* | | | Merge branch 'tc-fix-wildcard-protected-delete-merged' into 'master'Rémy Coutable2017-08-023-1/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Delete Merged Branches handle wildcard protected branches correctly Closes #35592 See merge request !13251
| * | | | Make Delete Merged Branches handle wildcard protected branches correctlyToon Claes2017-08-023-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Delete Merged Branches" button should filter out protected branches matching the wildcard patterns. Closes gitlab-org/gitlab-ce#35592.
* | | | | Merge branch 'update-milestone-docs' into 'master'Sean McGivern2017-08-021-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Update milestone docs CE See merge request !13233
| * | | | Update milestone docs CEVictor Wu2017-08-021-0/+8
|/ / / /
* | | | Merge branch 'api_project_events_target_iid' into 'master'Rémy Coutable2017-08-023-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose target_iid in Events API See merge request !13247
| * | | | Expose target_iid in Events APIsue4452017-08-023-1/+7
| | | | |
* | | | | Merge branch 'ericy_ts/protected_branches_api' into 'master'Rémy Coutable2017-08-0211-8/+504
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Extending API for protected branches See merge request !12756
| * | | | | Extending API for protected branchesEric2017-08-0211-8/+504
|/ / / / /
* | | | | Merge branch 'rugged-is-ancestor' into 'master'Sean McGivern2017-08-022-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add rugged_is_ancestor method See merge request !13232
| * | | | | Add rugged_is_ancestor methodJacob Vosmaer2017-08-012-1/+8
| | | | | |
* | | | | | Merge branch '35769-fix-ruby-2-4-compatibility' into 'master'Sean McGivern2017-08-022-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Issue board when using Ruby 2.4 Closes #35769 See merge request !13220
| * | | | | | Fix Issue board when using Ruby 2.435769-fix-ruby-2-4-compatibilityRémy Coutable2017-08-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4, Hash#compact exists and returns a Hash, while in Ruby 2.3, Hash#compact is implemented by Rails and returns a new `ActionController::Parameters` instance in this case. Also, `ActionController::Parameters#compact` is deprecated in Rails 5.1 so we're using `reject { |_, value| value.nil? }` instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'rs-issuables-list-metadata-shared-examples' into 'master'Rémy Coutable2017-08-022-9/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the 'issuables list meta-data' shared example less dangerous See merge request !13236
| * | | | | | | Make the 'issuables list meta-data' shared example less dangerousrs-issuables-list-metadata-shared-examplesRobert Speicher2017-08-012-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shared example would take an object's database ID and create a number of objects based on it. If for some reason the ID were a high number, like 20, this would create `20 + 21 + 22` objects. Not only was this dangerous from a performance perspective, it was entirely unnecessary, as the behavior it was testing is already well-tested in the unit test for the underlying object. For a controller test, which is what's including this shared example, all we need to do is verify that the assigned object contains the correct `id => object` Hash, which is what we now test for.
* | | | | | | | Merge branch 'rs-empty_project-cleanup' into 'master'Rémy Coutable2017-08-02115-200/+214
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure all project factories use `:repository` trait or `:empty_project` See merge request !13238
| * | | | | | | | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-01115-200/+214
| |/ / / / / / /
* | | | | | | | Merge branch 'add-filtered-search-group-issues-ce' into 'master'Phil Hughes2017-08-0219-45/+400
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add filtered search to group issue dashboard Closes #33575 See merge request !13167
| * | | | | | | | Add filtered search to group issue dashboardClement Ho2017-08-0219-45/+400
|/ / / / / / / /
* | | | | | | | Merge branch 'use-npm-cropper' into 'master'Phil Hughes2017-08-024-2995/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove jQuery cropper plugin from vendors directory See merge request !13239
| * | | | | | | | include cropper jQuery plugin as an npm moduleuse-npm-cropperMike Greiling2017-08-014-2995/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into ↵Douwe Maan2017-08-027-36/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add kube_namespace and standardize common variables for additional metrics queries See merge request !13169
| * | | | | | | | Remove default arguments for common query contextpawel/add_more_variables_to_additional_metrics-35267Pawel Chojnacki2017-08-012-2/+4
| | | | | | | | |
| * | | | | | | | Move timeframe_start and timeframe_end to common query contextPawel Chojnacki2017-08-013-14/+8
| | | | | | | | |
| * | | | | | | | Give metric query context rspec examples correctly sounding names. + missing ↵Pawel Chojnacki2017-08-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whitespace
| * | | | | | | | Add changelog: add support for kube_namespace in Metrics queriesPawel Chojnacki2017-07-312-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + small whitespace fix to better separate tests
| * | | | | | | | Tests for query context variablesPawel Chojnacki2017-07-313-18/+34
| | | | | | | | |
| * | | | | | | | Context handling and tests cleanup + simple test kube_namespace context testPawel Chojnacki2017-07-315-26/+49
| | | | | | | | |
| * | | | | | | | add kube_namespace and standardize common variables for additional metrics ↵Pawel Chojnacki2017-07-313-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queries