Commit Graph
16488 Commits
Author SHA1 Message Date
Robert Speicher 31d73135b7 Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master'
Enable Style/EmptyLines Rubocop cop

#17478

See merge request !5013
2016-07-01 20:27:26 +00:00
Grzegorz Bizon 9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Douglas Barbosa Alexandre 3d69d01e1f Cache results from jQuery selectors to retrieve namespace name 2016-07-01 16:43:11 -03:00
Douglas Barbosa Alexandre 8353cc6111 Fix import button when import fail due the namespace already been taken 2016-07-01 16:04:24 -03:00
Rémy Coutable b227355973 Merge branch '19388-fix-snippets-notes-not-shown' into 'master'
Fix snippets comments not displayed

## What does this MR do?

Fix an issue where comments body were not displayed for project snippets anymore (see commit for details).

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

Because of #19388.

## What are the relevant issue numbers?

Fixes #19388.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5045
2016-07-01 17:16:05 +00:00
Rémy Coutable d71983f599 Fix snippets comments not displayed
The issue was that @notes were not passed to Banzai::NoteRenderer.render
in Projects::SnippetsController#show. This was forgotten in d470f3d1.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01 18:39:19 +02:00
Rémy Coutable 557ca2b31f Merge branch 'todos-api' into 'master'
Add Todos API

* Closes #14068
* Closes #14675 

- [x] Implementation
- [x]  Tests
- [x] Documentation
- [x] Changelog

See merge request !3188
2016-07-01 15:36:05 +00:00
Rémy Coutable c368cb605b Merge branch 'fix/import-export-events' into 'master'
Fixing problems with events for import/export

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19202

A couple of issues related to target being missing in exported `Events` (as being polymorphic and not have `ActiveRecord` relationships is a bit more tricky than normal models) plus as the export was in JSON, the import retrieves hashed fields as stringified hashes and not symbolized - so fixed that as well, which was the cause of https://gitlab.com/gitlab-org/gitlab-ce/issues/19202

Also fixed / refactored tests
:simpl
Import/Export Version has been bumped to 0.1.1 as theses changes to events won't work very well with old exports - forcing users to generate a new export in the new version.

See merge request !4987
2016-07-01 15:35:12 +00:00
Jacob Schatz 6c0d3b4cf3 Merge branch 'cache-autocomplete-results' into 'master'
Cache autocomplete results

## What does this MR do?

Caches the results of the autocomplete AJAX call to stop new GFM inputs on the page from requesting new data. The cache is then cleared on each new page so that it doesn't stay around per project.

See merge request !5043
2016-07-01 14:41:52 +00:00
Phil Hughes cc154fc47b Cache autocomplete results 2016-07-01 15:03:36 +01:00
James Lopez f29c30475e use has_many relationship with events 2016-07-01 15:34:10 +02:00
James Lopez d6d0a35598 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-events 2016-07-01 14:52:38 +02:00
Robert Schilling 3942621329 Expose target, filter by state as string 2016-07-01 14:52:04 +02:00
Rémy Coutable 8625bd3622 Improve the request / withdraw access button
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01 12:48:54 +02:00
Rémy Coutable b569f842b3 Merge branch 'enable-shared-runners-with-admins' into 'master'
Admin should be able to turn shared runners into specific ones:

## What does this MR do?

Make sure admins could turn shared runners into specific runners.

## Are there points in the code the reviewer needs to double check?

Is this the desired behaviour?

## Why was this MR needed?

Closes #19039
Closes #19272

![Screen_Shot_2016-06-30_at_9.30.05_PM](/uploads/97eb3b4923fd4e498b1f8ca70b1345c8/Screen_Shot_2016-06-30_at_9.30.05_PM.png)

See merge request !4961
2016-07-01 10:10:46 +00:00
Yorick Peterse a647d55773 Merge branch 'avoid-instantiate-tree-for-projects-show-readme-view' into 'master'
Avoid instantiation of a Git::Tree

See merge request !4997
2016-07-01 09:51:50 +00:00
Lin Jen-Shin 08070c7695 Merge remote-tracking branch 'upstream/master' into enable-shared-runners-with-admins
* upstream/master: (120 commits)
  Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.
  Remove additional entries from CHANGELOG
  Catch permission denied errors and ignore the disk
  Remove coveralls lines
  Make GH one-off auth the default again for importing GH projects
  Import from Github using Personal Access Tokens.
  Remove hardcoded gitlab-shell version in test env now that the required tag is published
  Updated breakpoint for sidebar pinning
  Expire branch/tag git data when needed.
  Remove unnecessary parens
  Enable Style/UnneededCapitalW Rubocop cop
  Expiry date on pinned nav cookie
  Fix broken spec in git_push_service_spec by stubbing an external issue tracker
  Handle external issues in IssueReferenceFilter
  Move Changelog entry for build retry fix to 8.9.4
  Add Changelog entry for build sidebar retry link fix
  Improve method that tells if build is retryable
  Do not show build retry link when build is active
  Remove coveralls as its unused
  Move changelot item "Add sub nav to file page view" to 8.9.4
  ...
2016-07-01 17:34:00 +08:00
Robert Schilling 631765748e Expose action_name 2016-07-01 10:49:34 +02:00
Robert Schilling 39e6f504fc Move to helper, no instance variables 2016-07-01 10:49:34 +02:00
Douglas Barbosa AlexandreandRobert Schilling a1f224d3f7 Add Todos API 2016-07-01 10:49:34 +02:00
Stan Hu ab81ea1e81 Merge branch 'improve-system-info' into 'master'
Catch permission denied errors and ignore the disk



See merge request !5017
2016-07-01 02:05:22 +00:00
Gabriel Mazetto ccd439da5d Merge branch 'build-reopen-json' into 'master'
Build path sends JSON file path

## What does this MR do?

Fixes an issue with browser caching JSON response on build page.

Steps to see:

- Open build (https://gitlab.com/gitlab-org/gitlab-ce/builds/2030226)
- Close tab
- Re-open tab

You should now see some JSON 😞 

This MR appends `.json` to the end of the build URL so that the browser can't cache it as the same URL.


See merge request !4935
2016-06-30 19:39:51 +00:00
Robert Speicher dc2d0051dc Merge branch 'fix/build-retry-button-in-view' into 'master'
Do not show build retry link when build is active

Closes #19244

See merge request !4967
2016-06-30 18:23:34 +00:00
Josh Frye 7dbc3d97d1 Catch permission denied errors and ignore the disk 2016-06-30 13:53:35 -04:00
Rémy Coutable ce6635406c Make GH one-off auth the default again for importing GH projects
Advertise the PAT as an alternative unless GH import is not configured.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-30 18:48:17 +02:00
Eric K IdemaandRémy Coutable 12aa1f898d Import from Github using Personal Access Tokens.
This stands as an alternative to using OAuth to access a user's Github
repositories.  This is setup in such a way that it can be used without OAuth
configuration.

From a UI perspective, the how to import modal has been replaced by a full
page, which includes a form for posting a personal access token back to the
Import::GithubController.

If the user has logged in via GitHub, skip the Personal Access Token and go
directly to Github for an access token via OAuth.
2016-06-30 18:48:17 +02:00
Jacob Schatz c5d164d1df Merge branch 'sidebar-breakpoint' into 'master'
Updated breakpoint for sidebar pinning

## What does this MR do?

Updates the breakpoint for sidebar pinning to 1024px.

Think we will have the same issue as before when picking into stable with `$window` not being defined.

See merge request !5019
2016-06-30 15:53:45 +00:00
Yorick Peterse d9885160ba Merge branch '18709-branch-tag-collection-caching' into 'master'
Project dashboard appears to be loading tags on every request

See merge request !4996
2016-06-30 15:38:03 +00:00
Robert Speicher f991b7fce6 Merge branch 'code_style_fixes' into 'master'
Remove unnecessary parens and other code style fixes

This MR is based on reviewers` comments to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440

See merge request !5015
2016-06-30 15:29:09 +00:00
Phil Hughes 805b9a8347 Updated breakpoint for sidebar pinning 2016-06-30 16:15:32 +01:00
Jacob Schatz 73196fbd65 Merge branch 'pin-nav-cookie-expiry' into 'master'
Expiry date on pinned nav cookie

## What does this MR do?

Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing.

See merge request !5009
2016-06-30 14:39:07 +00:00
Paco Guzman 5fe85bc8ca Expire branch/tag git data when needed.
When pushing commits to existing branches we don’t
need to flush branch git data (branch names / counts)

When flushes the cache when pushing commits skip to
flush branch and tag git data (names / counts) because
those operations are managed explicitly in each case

Repopulated expired cache as soon as possible
2016-06-30 16:17:38 +02:00
Lin Jen-Shin 63477fd27f Disable Metrics/CyclomaticComplexity for Ability.allowed
There's little point to cut that down.
2016-06-30 21:38:29 +08:00
Lin Jen-Shin 59413153f5 Use warning for locked runners:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4961#note_12794221
2016-06-30 21:26:50 +08:00
Dmitriy Zaporozhets 99e5ae10be Merge branch 'global-ajax-error-handler' into 'master'
Global Ajax error handler

## What does this MR do?
Introduces a new global Ajax error handler to show a flash warning about the error detail of XHR requests which failed with status code 404 and 500

## Are there points in the code the reviewer needs to double check?
Double check the wording.

## Why was this MR needed?
A global solution for the problem in the #17880

## What are the relevant issue numbers?
Fixes #17880 

## Screenshots (if relevant)

For requests failed with 404 - 500 

![Screen_Shot_2016-06-21_at_00.07.26](/uploads/04bb3a5a958c3d21aef4fd12bd3d105a/Screen_Shot_2016-06-21_at_00.07.26.png)

For requests failed with 401

![Screen_Shot_2016-06-21_at_00.08.30](/uploads/25cc885ba388f4c6f4c555fa338e1a63/Screen_Shot_2016-06-21_at_00.08.30.png)

See merge request !4797
2016-06-30 13:05:03 +00:00
Valery Sizov 13fc95acc4 Remove unnecessary parens 2016-06-30 16:01:26 +03:00
Dmitriy Zaporozhets 1c2e7af6af Merge branch 'issue-18886' into 'master'
Loop all disks when displaying system info. Closes #18886



See merge request !4983
2016-06-30 12:56:59 +00:00
Yorick Peterse 1a68a0a6f5 Merge branch 'shards' into 'master'
Implement multiple repository mount points

See merge request !4578
2016-06-30 11:02:43 +00:00
Phil Hughes bf970141a1 Expiry date on pinned nav cookie 2016-06-30 11:58:34 +01:00
Grzegorz Bizon f9c5f18d44 Improve method that tells if build is retryable
This method now should return false if build is not completed. If build
is running then it is not retryable, therefore `Ci::Build#retryable?`
returned wrong value. This commit changes this behavior
2016-06-30 11:06:19 +02:00
Grzegorz Bizon 94cec500c5 Do not show build retry link when build is active 2016-06-30 11:06:19 +02:00
Annabel DunstoneandDmitriy Zaporozhets 5987ad2569 Add sub nav to file view 2016-06-30 10:03:02 +02:00
Alejandro Rodríguez 4a8a69837a Add Application Setting to configure default Repository Path for new projects 2016-06-29 23:35:00 -04:00
Alejandro Rodríguez 86359ec854 Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
Fatih Acet b32a6add8f Merge branch 'fix_filebrowser_reload' into 'master'
File Browser navigation fixes

Fixes a double request being made when clicking the file name when navigating through file browser and also fixes opening a file in a new tab or when doing ctrl + click.

Closes #19050

**Before**

![navigation-old](/uploads/f9a40c91e430e31beae3a896cffb1c68/navigation-old.gif)

**After**

![navigation](/uploads/dec9b43894c00cc09d80d19c83506530/navigation.gif)


See merge request !4891
2016-06-30 00:49:54 +00:00
Fatih Acet 48843c0d85 Merge branch '19157-use-shortcuts-is-not-working-on-gitlab-com-help' into 'master'
Fixed 'use shortcuts' button on docs

## What does this MR do?

Exposes 'onToggleHelp() to window object through `showHelp()` so a help panel can be toggled globally using `showHelp()`.

## Are there points in the code the reviewer needs to double check?

Is this the best implementation? I actually think this is tidier than doing something like `onclick="new Shortcuts().onToggleHelp"` or `$.trigger 'keydown', char: '?'` but let me know.

## Why was this MR needed?

Docs UX

## What are the relevant issue numbers?

Closes #19157.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
Closes #19157

See merge request !4979
2016-06-30 00:09:05 +00:00
Jacob Schatz dbac53aa26 Merge branch 'left-align-flash-messages' into 'master'
Align flash messages with left side of page content

## What does this MR do?

- align flash messages with left side of page content

## Are there points in the code the reviewer needs to double check?

- flash messages in general

## Why was this MR needed?

- flash messages didn't fit new design

## What are the relevant issue numbers?

closes  #18688

## Screenshots

# Before

![failed-login](/uploads/fb57d288fb7ae775cc0b8dbb0c7b6af2/failed-login.png)

---

![explore-blocked-account](/uploads/aa6d5ff74a4c9ed29ed361f2ffdf5c8e/explore-blocked-account.png)

---

![project-blocked-account](/uploads/4f36118f5438d661ea202b180bf9cb8d/project-blocked-account.png)

---

![issue-blocked-account](/uploads/68e87385ec30952797dc5c1f8f36216d/issue-blocked-account.png)

---

![inline-flash](/uploads/c0aba047f90d56001265e37ba9751e19/inline-flash.png)

---

# After

![failed-login](/uploads/d45d2d832a16af8e1854f1832e7b87a4/failed-login.png)

---

![blocked-account](/uploads/ddcd3d23569ded403700c01934df61df/blocked-account.png)

---

![project-blocked-account](/uploads/9e286c3b95f70cae1819930a09cc1307/project-blocked-account.png)

---

![issue-blocked-account](/uploads/4fde8e770eab0dae03b25e1402f171a1/issue-blocked-account.png)

---

The left padding will be fixed by  !4854

![inline-flash](/uploads/081b824b99d8ca65d67e9d15778a991d/inline-flash.png)

---

![flash-dismissed](/uploads/641e6227050de22e0df9a85ffca4ced1/flash-dismissed.png)

See merge request !4959
2016-06-29 23:13:56 +00:00
Luke "Jared" Bennett 8cdee2bab2 Exposed 'onToggleHelp() to window object so showHelp() can be a global function'
Removed from window and used static method
2016-06-29 23:15:36 +01:00
Alfredo Sumaran 6a626a465c Fixes opening files on a new tab with meta key + click or using mouse middle button 2016-06-29 16:49:48 -05:00
Alfredo Sumaran 6c9f5a50e9 Skip element that is wrapped by a link
This fixes the double request being made to the same URL
2016-06-29 16:49:48 -05:00