Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloading | http://jneen.net/ | 2017-06-29 | 1 | -1/+1 |
| | |||||
* | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' ↵ | Robert Speicher | 2017-06-29 | 1 | -5/+34 |
|\ | | | | | | | | | | | | | | | | | into 'master' Allow the feature flags to be enabled/disabled with more granularity Closes #34078 See merge request !12357 | ||||
| * | Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularity | Rémy Coutable | 2017-06-28 | 1 | -4/+4 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ↵ | Rémy Coutable | 2017-06-27 | 1 | -0/+1 |
| | | | | | | | | | | | | exclusive Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Allow the feature flags to be enabled/disabled with more granularity | Rémy Coutable | 2017-06-27 | 1 | -5/+33 |
| | | | | | | | | | | | | | | | | This allows to enable/disable a feature flag for a given user, or a given Flipper group (must be declared statically in the `flipper.rb` initializer beforehand). Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'refactor/declarative-policy' into 'master' | Sean McGivern | 2017-06-29 | 1 | -1/+3 |
|\ \ | | | | | | | | | | | | | Refactor/declarative policy See merge request !10515 | ||||
| * | | use subject scope in :id/users | http://jneen.net/ | 2017-06-27 | 1 | -1/+3 |
| |/ | | | | | | | since we're loading all the members anyways | ||||
* | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into ↵ | Douwe Maan | 2017-06-29 | 2 | -2/+10 |
|\ \ | | | | | | | | | | | | | | | | | | | 'master' Add group members counting related data on namespaces API See merge request !12497 | ||||
| * | | Rename members_count to members_count_with_descendants and expose only to ↵ | Oswaldo Ferreira | 2017-06-28 | 2 | -3/+7 |
| | | | | | | | | | | | | group admins | ||||
| * | | Add "members_count" and "parent_id" data on namespaces API | Oswaldo Ferreira | 2017-06-28 | 1 | -1/+5 |
| | | | |||||
* | | | Fix current feature related specs | Tiago Botelho | 2017-06-28 | 1 | -1/+2 |
|/ / | |||||
* | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-status | Kamil Trzcinski | 2017-06-27 | 1 | -0/+3 |
|/ | |||||
* | Fix optional args for POST :id/variables | Lin Jen-Shin | 2017-06-27 | 1 | -1/+1 |
| | | | | | Always use declared_params(include_missing: false) so that we don't give nils for optional arguments | ||||
* | fix spec failures | James Lopez | 2017-06-24 | 1 | -1/+1 |
| | |||||
* | fix spec failures | James Lopez | 2017-06-23 | 1 | -4/+4 |
| | |||||
* | update code based on feedback | James Lopez | 2017-06-23 | 1 | -2/+4 |
| | |||||
* | refactor update user service not to do auth checks | James Lopez | 2017-06-23 | 3 | -3/+3 |
| | |||||
* | fix spec failures | James Lopez | 2017-06-23 | 1 | -4/+6 |
| | |||||
* | more refactoring based on feedback | James Lopez | 2017-06-23 | 1 | -3/+4 |
| | |||||
* | refactor emails service | James Lopez | 2017-06-23 | 1 | -8/+0 |
| | |||||
* | update missing email actions | James Lopez | 2017-06-23 | 1 | -6/+4 |
| | |||||
* | fix specs | James Lopez | 2017-06-23 | 1 | -2/+2 |
| | |||||
* | update to use emails destroy service | James Lopez | 2017-06-23 | 1 | -2/+3 |
| | |||||
* | fixed specs | James Lopez | 2017-06-23 | 1 | -1/+1 |
| | |||||
* | added service in the rest of controllers and classes | James Lopez | 2017-06-23 | 2 | -3/+3 |
| | |||||
* | fix api and controller issues | James Lopez | 2017-06-23 | 1 | -2/+7 |
| | |||||
* | update notification settings, fix api specs | James Lopez | 2017-06-23 | 2 | -2/+7 |
| | |||||
* | Filter archived project in API v3 only if param present | vanadium23 | 2017-06-21 | 2 | -2/+5 |
| | |||||
* | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 11 | -54/+54 |
| | |||||
* | Merge branch '33878-fix-edit-deploy-key' into 'master' | Rémy Coutable | 2017-06-21 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Fix edit button for deploy keys available from other projects Closes #33878 See merge request !12301 | ||||
| * | Fix edit button for deploy keys available from other projects | Alexander Randa | 2017-06-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dt/printing-to-api' into 'master' | Rémy Coutable | 2017-06-21 | 2 | -0/+3 |
|\ \ | | | | | | | | | | | | | add printing_merge_request_link_enabled to API See merge request !12240 | ||||
| * | | add printing_merge_request_link_enabled to API | David Turner | 2017-06-19 | 2 | -0/+3 |
| | | | |||||
* | | | Merge branch '28517-discover-by-userid' into 'master' | Douwe Maan | 2017-06-20 | 1 | -3/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Allow discover by userid - issue 28517 Closes #28517 See merge request !12314 | ||||
| * | | | Allow discover by userid - issue 28517 | Matt Walsh | 2017-06-20 | 1 | -3/+8 |
| | |/ | |/| | |||||
* | | | Re-instate is_admin flag in users API is current user is an admin | Mike Ricketts | 2017-06-20 | 2 | -3/+6 |
|/ / | |||||
* | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master' | Douwe Maan | 2017-06-19 | 2 | -2/+7 |
|\ \ | | | | | | | | | | | | | Add "project was moved" error messages for git See merge request !11259 | ||||
| * | | Add “Project moved” error to Git-over-SSH | Michael Kozono | 2017-06-16 | 2 | -2/+7 |
| |/ | |||||
* | | Merge branch 'add-since-and-until-params-to-issuables' into 'master' | Rémy Coutable | 2017-06-19 | 2 | -0/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | add created_after and created_before params to issuables Closes #32901 See merge request !12151 | ||||
| * | | add since and until params to issuables | Kyle Bishop | 2017-06-18 | 2 | -0/+4 |
| | | | |||||
* | | | Merge branch '26212-upload-user-avatar-trough-api' into 'master' | Rémy Coutable | 2017-06-19 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Accept image for avatar in user API Closes #26212 See merge request !12143 | ||||
| * | | | Accept image for avatar in user API | vanadium23 | 2017-06-16 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'issue_33205' into 'master' | Sean McGivern | 2017-06-19 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Fix API bug accepting wrong merge requests parameters Closes #33205 See merge request !12173 | ||||
| * | | Fix API bug accepting wrong merge requests parametersissue_33205 | Felipe Artur | 2017-06-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master' | Sean McGivern | 2017-06-16 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811 | ||||
| * | | | Rename "Slash commands" to "Quick actions" | Eric Eastwood | 2017-06-15 | 2 | -4/+4 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand` | ||||
* | | | Order issues by priority | Felipe Artur | 2017-06-16 | 1 | -2/+2 |
| | | | |||||
* | | | Remove Drag and drop and sorting from milestone view | Felipe Artur | 2017-06-16 | 1 | -2/+2 |
| | | | |||||
* | | | #13336 - display multiple messages in both the UI and git output | Mike Ricketts | 2017-06-15 | 1 | -1/+9 |
|/ / | |||||
* | | Merge branch 'help-landing-page-customizations' into 'master' | Douwe Maan | 2017-06-14 | 2 | -0/+7 |
|\ \ | | | | | | | | | | | | | Allow more customization to Help landing page See merge request !11878 |