Commit Graph

798 Commits

Author SHA1 Message Date
Douglas Barbosa Alexandre 79a132a38d Fix spec for Projects::Boards::ListsController 2017-02-03 17:02:43 +03:00
Douwe Maan e7d530a624 Merge branch 'fix-git-hooks-when-creating-file' into 'master'
Don't execute git hooks if you create branch as part of other change

Closes #23439

See merge request !7237
2017-02-02 23:26:35 +00:00
Sean McGivern 34918d94c0 Use `add_$role` helper in snippets specs 2017-02-02 14:03:08 +00:00
Sean McGivern c63194ce6f Check public snippets for spam
Apply the same spam checks to public snippets (either personal snippets
that are public, or public snippets on public projects) as to issues on
public projects.
2017-02-02 10:23:51 +00:00
Lin Jen-Shin 54fca95160 Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master: (190 commits)
  Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion.
  update spec
  Change the reply shortcut to focus the field even without a selection.
  use destroy_all
  Remove settings cog from within admin scroll tabs; keep links centered
  add changelog
  remove old project members from project
  add spec replicating validation error
  Fix small typo on new branch button spec
  Improve styling of the new issue message
  Don't capitalize environment name in show page
  Abillity to promote project labels to group labels
  Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
  Update and pin the `jwt` gem to ~> 1.5.6
  refactor merge request build service
  Update index.md
  Clarify that Auto Deploy requires a public project.
  19164 Add settings dropdown to mobile screens
  cop for gem fetched from a git source
  Add CHANGELOG entry
  ...
2017-02-02 11:54:35 +08:00
Sean McGivern 86af3ed55e Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'
Promote project labels to group labels

Closes #24021

See merge request !7242
2017-01-31 13:35:26 +00:00
Ritave 5d871dccbe Abillity to promote project labels to group labels
Fixes #24021
2017-01-31 12:50:52 +01:00
Kamil Trzciński e4bcdddfa7 Merge branch 'zj-display-error-team-fetch' into 'master'
Fix inconsistent return type

Closes #27150

See merge request !8290
2017-01-31 11:40:27 +00:00
Rémy Coutable 211f728ad2 Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'
Expose pipelines API for commits and merge requests

See merge request !8837
2017-01-31 07:48:40 +00:00
Grzegorz Bizon 8e8ec9d7bf Use ApiHelpers in merge request specs for API routes 2017-01-30 15:31:28 +01:00
Robert Speicher e629121870 Fix a transient failure in the `Explore::ProjectsController` spec 2017-01-27 11:57:06 -05:00
Grzegorz Bizon ac5b3ce02a Add controller tests for commit pipelines endpoint 2017-01-27 15:23:09 +01:00
Grzegorz Bizon 30c73d2d9f Add controller test for merge requests pipelines API 2017-01-27 14:45:56 +01:00
Fatih Acet c5bea1d2e8 Merge branch '27044-fix-explore-sorting-on-trending' into 'master'
Fix /explore sorting (trending)

Closes #27044

See merge request !8792
2017-01-26 20:36:31 +00:00
Eric Eastwood 6fbf24af27 Fix /explore sorting (trending)
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27044
2017-01-26 12:01:06 -06:00
Lin Jen-Shin 406dfd6e0f Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master:
  Ensure we have a project with a repo in GitlabMarkdownHelper specs
  Revert "Make sure TraceReader uses Encoding.default_external"
  Make sure TraceReader uses Encoding.default_external
  Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" [ci skip]
  Use `:empty_project` where possible in finder specs
  Use `empty_project` where possible in controller specs
  Use `:empty_project` where possible in helper specs
  Don’t count tasks that are not defined as list items correctly
  Use a project factory with a repository where necessary
  Use `:empty_project` where possible throughout spec/lib
  Use hashrocket for dasherized attribute
  Remove markdown file extension and add anchor to link
  Fixed builds info link on project settings page
  Factories with a project association use `:empty_project` by default
  Update enviroments.md the example for deleting an environment is missing the "s" in environments. curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/environments/1"  wil 404
2017-01-26 22:19:50 +08:00
Lin Jen-Shin 4587c78afa Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master: (1122 commits)
  Update CHANGELOG.md for 8.16.2
  Display project ID in project settings (!8572)
  fixed points from comments to improve code quality
  Update CHANGELOG.md for 8.14.8
  Statisfy eslint
  Add CHANGELOG entry
  Fix access to the wiki code via HTTP when repository feature disabled
  Display fullscreen button on small screens (!5302)
  Prevent removing fields from dropdowns on input elements
  fix for all themes
  Return struct instead of multiple values
  Fix race conditions for AuthorizedProjectsWorker
  Add User#nested_groups and User#nested_projects methods
  Fix spec failure due to timestamp ordering issue in mySQL
  Fixed error with filter keyboard tests
  `can?` already includes the `feature_available?` check
  Test there is no Merge Request button when MRs are disabled
  Ensure the correct Merge Request button is found
  Add 409 conflict tests
  Add CHANGELOG
  ...
2017-01-26 17:21:38 +08:00
Robert Speicher 4642ca6686 Use `empty_project` where possible in controller specs 2017-01-25 17:14:38 -05:00
Robert Speicher 94cc7cfad2 Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master'
Dont persist application settings in test env

See merge request !8715
2017-01-24 19:14:14 +00:00
Z.J. van de Weg 85f0229b15 Fix inconsistent return type 2017-01-24 14:18:30 +01:00
Douwe Maan 30d5e9fa54 Merge branch '22974-trigger-service-events-through-api' into 'master'
adds events to services api deserialization

Closes #22974

See merge request !8324
2017-01-23 16:44:12 +00:00
Grzegorz Bizon 632c2939bb Revert "Merge branch 'revert-9cac0317' into 'master' "
This reverts commit c20934869f, reversing
changes made to 4b7ec44b91.
2017-01-23 16:35:24 +01:00
Tiago Botelho 4b6e583ce0 adds test suite 2017-01-22 00:02:29 +00:00
Grzegorz Bizon baeaa97ef4 Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
This reverts merge request !8573
2017-01-21 22:55:35 +00:00
Robert Speicher 9cac031769 Merge branch 'dont-persist-application-settings-in-test-env' into 'master'
Don't persist application settings in test env

See merge request !8573
2017-01-20 15:42:54 +00:00
Rémy Coutable 34ef6ce3d3 Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master'
Moved the webhooks and services gear options to a single one called integrations

See merge request !8380
2017-01-20 10:05:19 +00:00
Kamil Trzciński fd1e4c7519 Merge branch '26117-sort-pipeline-for-commit' into 'master'
Add sorting pipelines for a commit

Closes #26117

See merge request !8319
2017-01-19 12:41:51 +00:00
Kamil Trzciński b71b0acd55 Merge branch 'zj-fix-admin-templates' into 'master'
Fix Slash command templates

Closes #26042

See merge request !8320
2017-01-19 11:34:40 +00:00
Takuya Noguchi 2dd5db749f Add sorting pipeline for a commit 2017-01-19 18:04:02 +09:00
Jose Ivan Vargas 373411d18d Corrected code style and titles 2017-01-18 15:19:35 -06:00
Jose Ivan Vargas bc7c6c6892 Fixed more tests 2017-01-18 15:19:35 -06:00
Jose Ivan Vargas 1ee4f98694 Fixed spinach feature tests for the services and hooks controllers
Added a test for the integrations controller
2017-01-18 15:19:35 -06:00
Douwe Maan f208897ccb Merge branch 'backport-time-tracking-ce' into 'master'
Backport timetracking to CE

See merge request !8195
2017-01-18 15:49:22 +00:00
Sean McGivern cdf0af666c Merge branch 'i-#25814-500-error' into 'master'
Fix Compare page throws 500 error when any branch/reference is not selected

Closes #25814

See merge request !8523
2017-01-18 11:02:45 +00:00
Sean McGivern 25709853cb Merge branch '24915_merge_slash_command' into 'master'
Support `/merge` slash command for MRs

Closes #24915

See merge request !7746
2017-01-17 16:10:43 +00:00
Martin Cabrera fe4c2b8b75 Merge branch 'master' into i-#25814-500-error 2017-01-16 20:24:21 +01:00
Ruben Davila 17196a2ff3 Backport backend work for time tracking. 2017-01-15 11:10:04 -05:00
sandish chen 81f7a7ab62 Fix to display notice when project settings updated.
Change validity checking for UpdateService.

Add return value for project update service.

Return 302(redirect_to) when successfully updated.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-15 01:31:25 -05:00
Rémy Coutable f6cc29ed83 Don't persist ApplicationSetting in test env
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-15 01:07:29 -05:00
Martin Cabrera 87c39b6d39 Added specs for the preservation of the from/to parameter 2017-01-15 02:28:01 +01:00
Martin Cabrera 241e2e875b Merge branch 'master' into i-#25814-500-error 2017-01-15 01:18:38 +01:00
Jarka Kadlecova 557a0bf14c Address MR comments 2017-01-13 09:16:35 -05:00
Tiago Botelho bf4a042f6a fixes the issue 2017-01-12 15:49:48 -05:00
Jarka Kadlecova aa934c7469 refresh merge widget after using /merge command 2017-01-11 08:48:07 -05:00
Jarka Kadlecova 7ab3dd4b30 support `/merge` slash comand for MRs 2017-01-11 08:48:07 -05:00
Martin Cabrera 6972a35fec Added specs for branches compare when from & to are empty 2017-01-10 23:46:32 +01:00
Regis 6625f479f8 Merge branch 'master' into auto-pipelines-vue 2017-01-09 10:54:02 -07:00
Alfredo Sumaran 9cdfcbb50f Merge branch '25985-combine-members-and-groups-settings-pages' into 'master'
Moved the members and groups to single option called members

Closes #25985

See merge request !8281
2017-01-06 20:17:34 +00:00
Z.J. van de Weg df99883d44 Add tests for admin service templates 2017-01-06 13:21:49 +01:00
Regis 1655824fa4 Merge branch 'master' into auto-pipelines-vue 2017-01-04 10:55:25 -07:00