Commit Graph

1365 Commits

Author SHA1 Message Date
Mike Greiling 0994bbf9dd Merge branch 'master' into ide
* master: (86 commits)
  Show all labels
  33874 confidential issue redesign
  Exclude merge_jid on Import/Export attribute configuration
  Resolve "User dropdown in filtered search does not load avatar on `master`"
  Re-add column locked_at on migration rollback
  Group-level new issue & MR using previously selected project
  [EE Backport] Update log audit event in omniauth_callbacks_controller.rb
  more eagerly bail when the state is prevented
  Move locked_at removal to post-deployment migration
  Add class to other sidebars
  Improve mobile sidebar
  reduce iterations by keeping a count of remaining enablers
  Store & use ConvDev percentages returned by Version app
  Store MergeWorker JID on merge request, and clean up stuck merges
  Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
  DRY up caching in AbstractReferenceFilter
  Update CHANGELOG
  Add CHANGELOG entry
  Fix html structure Removes test for removed behavior
  Port form back to use form_tag
  ...
2017-08-07 22:44:47 -05:00
Mike Greiling 1375db509a fix repo_edit_button_spec.js 2017-08-07 22:30:40 -05:00
Mike Greiling 24ac2ea80d fix test failures in repo_preview_spec.js 2017-08-07 22:08:54 -05:00
Regis Boudinot c543970d93 Show all labels 2017-08-08 01:52:18 +00:00
Stan Hu fd40bce9cc Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"

Closes #31207

See merge request !13207
2017-08-08 01:47:48 +00:00
Regis Boudinot f59bdbf0f1 33874 confidential issue redesign 2017-08-07 23:56:16 +00:00
Bryce Johnson 0532bff6d4 Group-level new issue & MR using previously selected project 2017-08-07 20:55:50 +00:00
Mike Greiling 7767ceef47 Merge branch 'master' into ide
* master: (177 commits)
  Add changelog
  Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
  Make contextual sidebar collapsible
  Fixed sidebar context header hover colors
  Use correct `Environment`-class within `Gitlab` namespace
  Remove gl.Activities from Commits page
  Move `let` calls inside the `describe` block using them
  Add `/assign me` alias support for assigning issuables to oneself
  GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
  Use `broken_storage` in the fs_shards_spec.
  Eager load project creators for project dashboards
  Memoize a user's personal projects count
  Remove redundant query from User#recent_push
  Improve checking if projects would be returned
  Change spelling of gitlab-shell
  Remove unused #tree-holder
  Add custom linter for inline JavaScript to haml_lint
  Rename user_can_admin? because it's more accurate
  Synchronous zanata community contribution translation
  Add Korean translation to i18n
  ...
2017-08-07 15:20:09 -05:00
Mike Greiling 1d5a306596 resolve eslint violations 2017-08-07 15:10:09 -05:00
Phil Hughes c2a8daf992 Merge branch '15664-remove-jquery-nicescroll' into 'master'
Resolve "Remove jQuery Nicescroll"

Closes #15664, #30860, and #35885

See merge request !13262
2017-08-07 19:35:45 +00:00
Sean McGivern 4c8b666893 Merge branch 'zj-project-templates' into 'master'
Allow projects to be started from a template

Closes #32420

See merge request !13108
2017-08-07 19:24:14 +00:00
Oswaldo Ferreira 0640b3d1d8 Store MergeWorker JID on merge request, and clean up stuck merges 2017-08-07 15:23:37 -03:00
Luke "Jared" Bennett b3b244587d
[ci skip] Add repo_edit_button_spec and repo_preview_spec 2017-08-07 15:23:59 +01:00
Luke "Jared" Bennett 79aad4e795
Remove fdescs 2017-08-07 13:20:51 +01:00
Luke "Jared" Bennett f64a7c4780
Remove repo_binary_viewer as it is no longer needed 2017-08-07 13:10:28 +01:00
Luke "Jared" Bennett ec93e17ac5
Cover linkClicked in repo_prev_directory 2017-08-07 13:08:46 +01:00
Luke "Jared" Bennett 219b58abe8
Cover linkClicked in repo_file 2017-08-07 13:08:33 +01:00
Luke "Jared" Bennett d0bcf0170b
Tidy makeCommit and test resetCommitState in repo_commit_section 2017-08-07 13:08:12 +01:00
Luke "Jared" Bennett 62e3b28c56
Cover repo_tabs xClicked method 2017-08-07 12:55:02 +01:00
Luke "Jared" Bennett 126d47754c
Cover repo_tab xClicked 2017-08-07 12:51:46 +01:00
Luke "Jared" Bennett 3f15afbe3f
Fix karma repo_file_buttons_spec and repo_commit_section_spec 2017-08-07 12:24:15 +01:00
Luke "Jared" Bennett 8a6d236d45
Fix eslint 2017-08-07 11:45:58 +01:00
Filipa Lacerda 3b9012871d Merge branch 'master' into zj-project-templates
* master: (623 commits)
  Fix issues with pdf-js dependencies
  fix missing changelog entries for security release on 2017-01-23
  Update top bar issues icon
  Fix pipeline icon in contextual nav for projects
  Since mysql is not a priority anymore, test it less
  Fix order of CI lint ace editor loading
  Add container registry and spam logs icons
  Fix different Markdown styles
  Backport to CE for:
  Make new dropdown dividers full width
  Fix spec
  Fix spec
  Fix spec
  Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
  Add changelog
  Install yarn via apt in update guides
  Use long curl options
  fix
  Add a spec for concurrent process
  Remove monkey-patched Array.prototype.first() and last() methods
  ...
2017-08-07 11:09:50 +01:00
Phil Hughes 3a087a0080 Merge branch '33095-mr-widget-ui' into 'master'
Merge Request widget Improvements

Closes #33095

See merge request !12601
2017-08-07 08:37:45 +00:00
Mike Greiling d935278055 Fix issues with pdf-js dependencies 2017-08-07 07:47:29 +00:00
Simon Knox bce029a23b clean up merge request widget UI 2017-08-07 13:20:33 +10:00
Luke "Jared" Bennett ecfe4c2542
Remove fdescribe 2017-08-05 18:51:19 +01:00
Luke "Jared" Bennett d7b8f217cd
test tabs divider for repo_tabs_spec 2017-08-05 17:24:16 +01:00
Mike Greiling 12c6abf9db remove nicescroll from jobs page and remove the library from common.bundle.js 2017-08-04 15:52:55 -05:00
Luke "Jared" Bennett 38a6127160
Fix repo_file_options_spec 2017-08-04 12:15:51 +01:00
Luke "Jared" Bennett c3afc61f8a
Fix repo_file_buttons_spec 2017-08-04 12:15:36 +01:00
Mike Greiling 7256626d60 Remove monkey-patched Array.prototype.first() and last() methods 2017-08-04 08:07:05 +00:00
Phil Hughes 30777178e3
fixed jumping when bar gets stuck
added specs to sticky util file
added `No files found.` text when results are empty
2017-08-03 17:03:49 +01:00
Douwe Maan 2197ee02e9 Merge branch 'master' into ide 2017-08-03 13:13:06 +02:00
Filipa Lacerda beaa0723b8 Merge branch 'sidebar-fly-out-sub-nav' into 'master'
Fly-out dropdown menu in new sidebar

Closes #34026

See merge request !12938
2017-08-03 09:33:00 +00:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Luke "Jared" Bennett 5c7ba34f1e
Reorganise repo/ files to match guidelines 2017-08-02 20:09:26 +01:00
Phil Hughes e4c20cd3fe
Merge branch 'master' into sidebar-fly-out-sub-nav 2017-08-02 16:37:40 +01:00
Luke "Jared" Bennett ef3dc20b7a
Fix eslint 2017-08-02 15:44:49 +01:00
Luke "Jared" Bennett 5b890d44e4
Remove fdescribes 2017-08-02 15:42:11 +01:00
Luke "Jared" Bennett 1cb18b00f1
[ci skip] Improved repo_file_spec 2017-08-02 15:39:57 +01:00
Filipa Lacerda 489a954942 Merge branch '35408-group-auto-avatars' into 'master'
Show auto-generated avatars in Groups dashboard tree for Groups without avatars

See merge request !13188
2017-08-02 14:36:10 +00:00
Luke "Jared" Bennett a1f2bd7daa
[ci skip] Remove lock from ce 2017-08-02 15:28:10 +01:00
Luke "Jared" Bennett 3abceda69e
[ci skip] Improve repo_commit_section_spec 2017-08-02 15:18:38 +01:00
Luke "Jared" Bennett 4402eefa42
[ci skip] Improve repo_binary_viewer_spec 2017-08-02 14:09:06 +01:00
Rémy Coutable 0bc1dfb6d5 Merge branch 'rs-empty_project-cleanup' into 'master'
Ensure all project factories use `:repository` trait or `:empty_project`

See merge request !13238
2017-08-02 09:45:42 +00:00
Clement Ho 974a04026d Add filtered search to group issue dashboard 2017-08-02 09:27:24 +00:00
Phil Hughes 25d6a6c4b5
stop mobile from showing the sub-items 2017-08-02 10:22:13 +01:00
kushalpandya 9636da306c Use `$mount` for component rendering, remove tests for `props` datatype as unnecessary 2017-08-02 14:45:30 +05:30
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04:00