Commit Graph

2143 Commits

Author SHA1 Message Date
Lin Jen-Shin 9f5ac179d1 Rename ci_config_file to ci_config_path 2017-07-05 20:11:01 +08:00
Lin Jen-Shin d7c32c5870 Fix various descriptions given the feedback 2017-07-04 02:00:50 +08:00
Lin Jen-Shin 62fdbbeeb0 Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Config-Path
* upstream/master: (123 commits)
  Backport changes to Projects::IssuesController and the search bar
  bugfix: use `require_dependency` to bring in DeclarativePolicy
  Resolve "Select branch dropdown is too close to branch name"
  Clean up issuable lists
  Defer project destroys within a namespace in Groups::DestroyService#async_execute
  Fixed new navgiation bar logo height in Safari
  Resolve "Issue dropdown persists when adding issue number to issue description"
  Move verification to block level instead of paragraph
  Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"
  Added code for defining SHA attributes
  Minor edits
  Job details won't scroll horizontally to show long lines
  Run mysql tests on stable preperation branches like 9-3-stable-patch-2
  Bring back branches badge to main project page
  optimize translation content based on comments
  supplement traditional chinese in taiwan translation
  Inserts exact matches of username, email and name to the top of the user search list
  Remove Namespace model default scope override and write additional test to Project search
  optimize translation content based on comments
  Limit OpenGraph image size to 64x64
  ...
2017-06-30 13:46:51 +08:00
http://jneen.net/ 7765dd6a1d bugfix: use `require_dependency` to bring in DeclarativePolicy 2017-06-29 11:57:59 -07:00
Robert Speicher 066a6c8ba8 Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into 'master'
Allow the feature flags to be enabled/disabled with more granularity

Closes #34078

See merge request !12357
2017-06-29 16:36:22 +00:00
Sean McGivern 8c5538be40 Merge branch 'refactor/declarative-policy' into 'master'
Refactor/declarative policy

See merge request !10515
2017-06-29 13:20:24 +00:00
Douwe Maan 46def2045e Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into 'master'
Add group members counting related data on namespaces API

See merge request !12497
2017-06-29 13:04:13 +00:00
Oswaldo Ferreira bd4c2847f4 Rename members_count to members_count_with_descendants and expose only to group admins 2017-06-28 17:27:01 -03:00
Oswaldo Ferreira da3e4f4128 Add "members_count" and "parent_id" data on namespaces API 2017-06-28 15:50:29 -03:00
Rémy Coutable 289fae78e9
Rename flipper_group to feature_group
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-28 19:29:56 +02:00
Tiago Botelho 34f57b462b Fix current feature related specs 2017-06-28 11:32:34 +01:00
Lin Jen-Shin 35674fcd47 Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Config-Path
* upstream/master: (12506 commits)
  Update CHANGELOG.md for 9.3.2
  Update architecture.md
  Fix changelog entry file extension
  Fix head pipeline stored in merge request for external pipelines
  updated gitlab-ci.yml to compile locale
  Ignore JSON files generated from PO files
  Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API
  Disable rainbow during SimpleExecutor specs to have consistence
  Slightly refactor pipeline schedules form in preparation for additions
  Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page"
  Make the SimpleExecutor rescue exceptions in the executing Checks
  Resolve "Unable to access edit comment from dropdown menu in certain screen sizes"
  Update changelog item
  revert removal of requestAnimationFrame and move to a separate MR/discussion
  rename getEmojiCategoryMap and remove unnecessary parameter
  Action Buttons on Prio Labels working again by setting pointer events to none on…
  Remove 'contains' option from Commit.find_all
  Remove Gitlab::Git::Repository#find_all
  Use latest chrome and chrome driver in GitLab QA
  Polish sidebar toggle
  ...
2017-06-28 15:53:12 +08:00
http://jneen.net/ 59e7c39f4c use subject scope in :id/users
since we're loading all the members anyways
2017-06-27 12:44:38 -07:00
Kamil Trzcinski 6afff7c607 Fix head pipeline stored in merge request for external pipelines 2017-06-27 21:08:31 +02:00
Rémy Coutable 5fa9d6a17d Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually exclusive
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-27 18:59:51 +02:00
Rémy Coutable b4d325c80c Allow the feature flags to be enabled/disabled with more granularity
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>
2017-06-27 18:59:51 +02:00
Lin Jen-Shin 01960fce25 Fix optional args for POST :id/variables
Always use declared_params(include_missing: false)
so that we don't give nils for optional arguments
2017-06-27 15:20:11 +08:00
James Lopez ae95310523 fix spec failures 2017-06-24 10:00:23 +02:00
James Lopez 859858c7e6 fix spec failures 2017-06-23 21:13:46 +02:00
James Lopez b33c638483 update code based on feedback 2017-06-23 17:11:31 +02:00
James Lopez b804db2648 refactor update user service not to do auth checks 2017-06-23 11:41:43 +02:00
James Lopez 12dc3992ea fix spec failures 2017-06-23 11:41:42 +02:00
James Lopez c9fd3dc42c more refactoring based on feedback 2017-06-23 11:41:42 +02:00
James Lopez 785cbb79e2 refactor emails service 2017-06-23 11:41:42 +02:00
James Lopez 831b2fccf9 update missing email actions 2017-06-23 11:41:42 +02:00
James Lopez 87bf08c96c fix specs 2017-06-23 11:41:42 +02:00
James Lopez 3bab585bec update to use emails destroy service 2017-06-23 11:41:42 +02:00
James Lopez ad44af2faa fixed specs 2017-06-23 11:41:42 +02:00
James Lopez 158550cf37 added service in the rest of controllers and classes 2017-06-23 11:41:42 +02:00
James Lopez bf3a3f3652 fix api and controller issues 2017-06-23 11:41:41 +02:00
James Lopez ef6a4240e5 update notification settings, fix api specs 2017-06-23 11:41:41 +02:00
vanadium23 eda30f3104 Filter archived project in API v3 only if param present 2017-06-21 20:04:25 +03:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Rémy Coutable 6a3da45a22 Merge branch '33878-fix-edit-deploy-key' into 'master'
Fix edit button for deploy keys available from other projects

Closes #33878

See merge request !12301
2017-06-21 10:08:16 +00:00
Rémy Coutable 18ef5be6c4 Merge branch 'dt/printing-to-api' into 'master'
add printing_merge_request_link_enabled to API

See merge request !12240
2017-06-21 09:00:57 +00:00
Douwe Maan 026455cf3a Merge branch '28517-discover-by-userid' into 'master'
Allow discover by userid - issue 28517

Closes #28517

See merge request !12314
2017-06-20 17:07:25 +00:00
Mike Ricketts 0e7478064f Re-instate is_admin flag in users API is current user is an admin 2017-06-20 14:54:29 +00:00
Matt Walsh 02ad2841d8 Allow discover by userid - issue 28517 2017-06-20 08:53:28 -06:00
Alexander Randa c7bcebd56e Fix edit button for deploy keys available from other projects 2017-06-20 11:23:13 +00:00
David Turner 1cd1bab3af add printing_merge_request_link_enabled to API 2017-06-19 13:33:15 -04:00
Douwe Maan b18c12ec6a Merge branch 'mk-add-project-moved-errors-for-git' into 'master'
Add "project was moved" error messages for git

See merge request !11259
2017-06-19 13:56:43 +00:00
Rémy Coutable 9fe6c2b2c2 Merge branch 'add-since-and-until-params-to-issuables' into 'master'
add created_after and created_before params to issuables

Closes #32901

See merge request !12151
2017-06-19 12:13:27 +00:00
Rémy Coutable 2923a0c8fe Merge branch '26212-upload-user-avatar-trough-api' into 'master'
Accept image for avatar in user API

Closes #26212

See merge request !12143
2017-06-19 10:41:00 +00:00
Sean McGivern a4a5cbf29a Merge branch 'issue_33205' into 'master'
Fix API bug accepting wrong merge requests parameters

Closes #33205

See merge request !12173
2017-06-19 08:06:01 +00:00
Kyle Bishop ef633d2478 add since and until params to issuables 2017-06-18 15:43:51 -07:00
Michael Kozono af784cc6e2 Add “Project moved” error to Git-over-SSH 2017-06-16 14:14:19 -07:00
vanadium23 83a9a472b3 Accept image for avatar in user API 2017-06-16 23:52:15 +03:00
Felipe Artur c472017078 Fix API bug accepting wrong merge requests parameters 2017-06-16 16:33:09 -03:00
Sean McGivern 352a9ed562 Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'
Rename "Slash commands" to "Quick actions"

Closes #27070

See merge request !11811
2017-06-16 16:32:53 +00:00
Felipe Artur 86fc145c3c Order issues by priority 2017-06-16 11:59:39 -03:00