Commit Graph

276 Commits

Author SHA1 Message Date
DJ Mountney 0d8fba4eec Merge branch 'path-disclosure-proj-import-export' into 'security'
Fix for path disclosure in project import/export

See merge request !2080
2017-04-05 21:06:36 -07:00
Bob Van Landuyt 7d5b8993f4 Build project cache key in a helper 2017-03-16 12:31:27 +01:00
Jan Christophersen 150c363752 Add the username of the current user to the HTTP(S) clone URL 2017-02-24 16:35:34 +01:00
Valery Sizov d52ef5efd0 Fixes after review 2017-02-23 15:31:03 +02:00
Valery Sizov 08e4d98cac Create master branch first if project is repository-less 2017-02-23 15:31:03 +02:00
Fatih Acet 97475d0b8d Merge branch '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master'
Update project visibility level ui to use dropdowns

Closes #24296, #24123, and #24032

See merge request !7645
2017-01-19 13:03:18 +00:00
Sean McGivern cdba3fe870 Merge branch 'issue_25682' into 'master'
Parse JIRA issue references even if Issue Tracker is disabled

Closes #25682

See merge request !8238
2016-12-29 20:12:45 +00:00
Felipe Artur f9963fe029 Parse JIRA issue references even if Issue Tracker is disabled 2016-12-29 16:52:04 -02:00
Alfredo Sumaran 2ed90c454d Merge branch '18786-go-to-a-project-order' into 'master'
Go to a project order

Closes #18786

See merge request !7737
2016-12-27 20:41:04 +00:00
Douwe Maan 20afb4c69e Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'
Allow to add deploy keys with write-access

Closes #1376

See merge request !7383
2016-12-27 15:00:49 +00:00
Sean McGivern 0ebd50ce00 Merge branch 'feature/more-storage-statistics' into 'master'
Add more storage statistics

See merge request !7754
2016-12-26 09:48:30 +00:00
Markus Koller 3ef4f74b1a
Add more storage statistics
This adds counters for build artifacts and LFS objects, and moves
the preexisting repository_size and commit_count from the projects
table into a new project_statistics table.

The counters are displayed in the administration area for projects
and groups, and also available through the API for admins (on */all)
and normal users (on */owned)

The statistics are updated through ProjectCacheWorker, which can now
do more granular updates with the new :statistics argument.
2016-12-21 16:39:49 +01:00
Markus Koller b8d8fd70d5
Remove unused ProjectsHelper#round_commit_count 2016-12-21 16:36:53 +01:00
Adam Niedzielski 9809a9af8a Introduce "Set up autodeploy" button to help configure GitLab CI for deployment
The button allows to choose a ".gitlab-ci.yml" template that automatically
sets up the deployment of an application.
The currently supported template is Kubernetes template.
2016-12-21 16:21:55 +01:00
Lin Jen-Shin 0f0738e788 Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-access-deploy-keys
* upstream/master: (538 commits)
  Reject blank environment vcariables in Gitlab::Git::RevList
  Add online terminal documentation
  Add changelog entry
  Add terminal UI and controller actions
  Fix specs
  Even out padding on plus button in breadcrumb menu
  Update font size of detail page header to 14px
  Update CHANGELOG.md for 8.13.10
  Update CHANGELOG.md for 8.14.5
  Fix Route#rename_children behavior
  Remove inline-block styling from status
  Add terminals to the Kubernetes deployment service
  Add a ReactiveCaching concern for use in the KubernetesService
  Add xterm.js 2.1.0 and a wrapper class to the asset pipeline
  Remove unnecessary hidden svg elements for icons.
  Fix consistent typo in environment.js
  Use a block to insert extra check for authenticate_build!
  Align milestone column header with count number
  Add Wiki import to BB importer
  Make CI badge hitboxes better match container
  ...
2016-12-20 20:54:40 +08:00
Jacopo 75060b93a6 Go to a project order
The order of "Go to a project" dropdown is based on last_activity_at
2016-12-15 22:34:39 +01:00
Dmitriy Zaporozhets 6328f26c41 Show full path in header UI for nested groups/projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-12-13 16:39:03 +02:00
Luke "Jared" Bennett 2c9bb13505
Fixed tests
Grab permissions description from backend

Review changes

Added unit tests
2016-12-10 17:28:36 +00:00
Lin Jen-Shin d6287ab230 Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-access-deploy-keys
* upstream/master: (488 commits)
  Merge branch 'issue_25064' into 'security'
  It's secret variables, not secure
  Fix dead links, add example of debug trace output, simplify titles
  Authorize users into imported GitLab project
  Document button secondary states. Update icons and color section
  Remove unused votes.scss
  Remove unused errors css
  Fixed MR widget content wrapping for XS viewports
  NIGNX -> Nginx
  Use pry-byebug instead byebug
  Fixed influence from other specs.
  Accept `issue new` as command to create an issue
  Update paranoia from 2.1.4 to 2.2.0.
  Use the pagination helper in the API
  Added changelog for #25221
  Fixed top margin for Builds page status header information
  Satisfied eslint
  Fix compatibility with Internet Explorer 11 for merge requests
  change the date label to match the date used
  fix gfm doc typo about two spaces for next line transfer
  ...
2016-12-06 20:53:07 +08:00
mattl 76d8c2e656 WIP: Adds a default commit message when adding a README (#25167) 2016-12-02 12:04:03 -05:00
Lin Jen-Shin 60fe975452 Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-access-deploy-keys
* upstream/master: (497 commits)
  Use single quote for strings
  Ue svg from SVGs object
  Dont trigger CI builds [ci skip]
  Revert "Test only migrations"
  Add custom copy for each empty stage
  Fetch only one revision
  Highlight nav item on hover
  Test only migrations
  Fix migration paths tests
  Scroll CA stage panel on mobile
  Fix CSS declaration
  administer to administrator
  Move SVGs to JS objects for easy reuse
  Improve deploy command message
  No enough data to Not enough data
  Keep the cookie name as before
  Fix variable usage
  Evalute time_ago method instead of printing it
  Removed button styling from restricted visibility levels and added checkboxes with icons
  Do not show overview message if there’s already CA data
  ...
2016-11-22 13:59:07 +08:00
Jacob Schatz a7616e03c5 Merge branch '20840-getting-started-better-empty-state-for-issues-view' into 'master'
Issues empty state

## What does this MR do?

Adds the empty state for the project, dashboard and group issues.

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

## Why was this MR needed?

## Screenshots (if relevant)

### Filtered to show no issues (on group issues page in this case but also dashboard and projects)

![Screen_Shot_2016-11-08_at_20.55.56](/uploads/b598af4a8a5e2c9fbb859abf36e70e4b/Screen_Shot_2016-11-08_at_20.55.56.png)

### Project with no issues

![Screen_Shot_2016-11-08_at_20.57.08](/uploads/8f54fdf1b3101c46299249fa2944207d/Screen_Shot_2016-11-08_at_20.57.08.png)

![Screen_Shot_2016-11-08_at_20.57.17](/uploads/1d2d162e1d845dd05e945d8ebb1d2101/Screen_Shot_2016-11-08_at_20.57.17.png)

### Group with no projects with any issues

![Screen_Shot_2016-11-08_at_20.54.55](/uploads/f28dc2038839d5bda0eb37f37927d5db/Screen_Shot_2016-11-08_at_20.54.55.png)

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #20840 

Closes #20850

See merge request !7309
2016-11-22 02:24:23 +00:00
Luke "Jared" Bennett a08fba63be
Added empty state svg and set up blank conditional
Added new spec step

Added empty state to dashboard

Split empty and filtered empty states

Moved empty_state icons into their own folder and DRY up empty state html

Fixed failing spec

Added to groups page

Review changes
2016-11-18 03:57:36 +00:00
Lin Jen-Shin af0242b3d6 We removed User#has_access_to? 2016-11-18 03:56:35 +08:00
Lin Jen-Shin a8a879eebc Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-access-deploy-keys
* upstream/master: (236 commits)
  Mention Git strategy none
  Remove ToC since it's now supported in the docs portal itself
  Add 8.14 to versions with further additions to review apps
  Add Limitations sections to environments and review apps docs
  Add link to environments docs
  Fix URL to review apps docs
  Add a prerequisites section, add some links
  Link to NGINX example project for the time being
  Get rid most of the irrelevant sections
  Add note about current limitation in $CI_BUILD_REF_NAME
  Add an intro and an Overview section for Review Apps
  WIP review apps
  Add Review apps link to CI README
  Add stop environment permissions and remove delete
  Add note about auto-stopping of environments
  Update CHANGELOG.md for 8.13.6
  Finish "Stopping envs" and "Grouping similar envs" sections
  Highlight first user autocomplete option
  Remove ToC and fix headings in Markdown docs
  Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'"
  ...
2016-11-17 23:28:58 +08:00
Lin Jen-Shin a9765fb47f Introduce has_access_to? so that we could reuse it
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18439108
2016-11-16 20:31:23 +08:00
Luke Bennett 7730f5f7ec
Removed soon-to-be un-needed project title additions from builds and environments
Removed unneeded `project_title` code and last reference

Added CHANGELOG entry
2016-11-09 12:23:21 +00:00
Felipe Artur cabc2a7160 Fix builds tab visibility 2016-10-31 09:05:01 +00:00
Felipe Artur da07c2e4d3 Add visibility level to project repository 2016-10-17 18:12:18 -02:00
Robert Speicher 4a191c83d1 Enable Lint/StringConversionInInterpolation cop and autocorrect offenses 2016-10-03 16:09:57 +02:00
Jacob Schatz 8e4a33f2e2 Merge branch '18849-project-snippets-page-isn-t-really-responsive' into 'master'
Update snippets UI

## What does this MR do?

Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849.

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

Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective.

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png)

![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png)

![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.png)

## 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #18849

See merge request !6210
2016-09-15 22:26:32 +00:00
Luke Bennett 56461e0c16
Reordered dropdown options
Rearranged datetime created line

Added `avatar_class` option to `link_to_member` so it can be hidden

Made snippet title font heavier

Added file title  bar

Hidden unneeded info from xs screens

Added visibility icon

Reveal file-actions on xs screens

Added comments icon to snippets list items

Refactored no-comments declaration into framework stylesheet

Final touch ups

Fixed snippets_spec
2016-09-07 15:12:03 +01:00
Felipe Artur dfa286c181 Fix project settings field 2016-09-06 17:37:56 -03:00
Phil Hughes f8513d7682 Refactored code to rely less on IDs that could change 2016-09-02 14:51:36 +01:00
Annabel Dunstone Gray bc13cd7a9b Merge branch '21506-fix-title-dropdown-chevron' into 'master'
Resolve "Inconsistency: Repo Title "down caret" cropped on smaller viewports"

## What does this MR do?

Fixes an issue where the dropdown chevron for a project list was not visible on smaller viewports.

This MR also changes the dropdown trigger into a `button` element for better accessibility (it can now be tabbed to like any link).

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

None that I can think of.

## Why was this MR needed?

Better accessibility and support for smaller viewports.

## Screenshots (if relevant)

Dropdown toggle now targetable by pressing tab to select.
![Screen_Shot_2016-08-31_at_9.12.15_PM](/uploads/8b2038a8ae259efd32da2e94a309ce88/Screen_Shot_2016-08-31_at_9.12.15_PM.png)

Chevron no longer hidden when project title length triggers `overflow: ellipsis`.
![Screen_Shot_2016-08-31_at_9.13.38_PM](/uploads/382e76c06e54bc307106a84ec21ab892/Screen_Shot_2016-08-31_at_9.13.38_PM.png)

## Does this MR meet the acceptance criteria?

- [x] CHANGELOG entry added
- Tests
  - [x] 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)

## What are the relevant issue numbers?

Closes #21506

See merge request !6140
2016-09-01 17:49:25 +00:00
Felipe Artur 892dea6771 Project tools visibility level 2016-09-01 11:47:59 -03:00
Mike Greiling 91c215f9a7 make projects dropdown accessible 2016-08-31 20:58:58 -05:00
Patricio Cano cf37d623e1 Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes. 2016-08-30 17:17:45 -05:00
Patricio Cano 9d8fbcc038 Added project specific enable/disable setting for LFS 2016-08-30 16:17:41 -05:00
Paco Guzman cfe512d6e9 Show "Create Merge Request" widget for push events to fork projects on the source project 2016-08-24 18:54:26 +02:00
Gokmen Goksel a927a9bf6b Support integration with Koding (online IDE)
Koding: #index: landing page for Koding integration

If enabled it will provide a link to open remote Koding instance url
for now we are also providing the sneak preview video for how
integration works in detail.

Repository: check whether .koding.yml file exists on repository

Projects: landing page: show Run in IDE (Koding) button if repo has stack file

Projects: MR: show Run in IDE Koding button if repo has stack file on active branch

ProjectHelpers: add_koding_stack: stack generator for provided project

With this helper we will auto-generate the required stack template
for a given project. For the feature we can request this base template
from the running Koding instance on integration.

Currently this will provide users to create a t2.nano instance on aws
and it'll automatically configures the instance for basic requirements.

Projects: empty state and landing page provide shortcuts to create stack

projects_helper: use branch on checkout and provide an entry point

This ${var.koding_queryString_branch} will be replaced with the branch
provided in query string which will allow us to use same stack template
for different branches of the same repository.

ref: b8c0e43c4c

projects_helper: provide sha info in query string to use existing vms

With this change we'll be able to query existing vms on Koding side
based on the commit id that they've created.

ref: 1d630fadf3

Integration: Docs: Koding documentation added

Disable /koding route if integration is disabled

Use application settings to enable Koding

Projects_helper: better indentation with strip_heredoc usage

Projects_helper: return koding_url as is if there is no project provided

current_settings: set koding_enabled: false by default

Koding_Controller: to render not_found once integration is disabled

Dashboard_specs: update spec for Koding enabled case

Projects_Helper: make repo dynamic

ref: 4d615242f4

Updated documentation to have right format
2016-08-19 12:10:58 -07:00
Annabel Dunstone afca25ed8a Link configuration button to .gitlab-ci.yml 2016-07-28 12:46:19 -05:00
Fatih Acet 7458892c32 Merge branch 'top-links-label' into 'master'
Aria labels on top header links

## What does this MR do?

Added `aria-label` to the links in top header bar for accessibility.

## What are the relevant issue numbers?

Closes #12797 


See merge request !5205
2016-07-14 13:50:38 +00:00
Phil Hughes c826b7c3e5 Fixed Rubocop 2016-07-13 11:58:58 +01:00
Phil Hughes 42865bfe7b Aria labels on top header links
Closes #12797
2016-07-12 16:02:31 +01:00
Phil Hughes da42b1bb53 Added author username tooltip in issuable header
Closes #13771
2016-07-12 15:46:28 +01:00
Drew Blessing 0b34cac1c5 Show last push widget in upstream after push to fork 2016-07-06 12:58:57 -05:00
Patricio Cano 512adc21fe Add setting that allows admins to choose which Git access protocols are enabled 2016-07-05 16:54:22 -05:00
Alejandro Rodríguez 86359ec854 Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
Grzegorz Bizon 9798ac77ed Enable Style/SpaceAfterColon Rubocop cops 2016-06-29 15:16:04 +02:00