home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,899 Commits 48 Branches 340 Tags
77794579078a9c65a4e9ee4fa8d94113104f69b3
Commit Graph
29899 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Lopez 7779457907 fix merge 2016-06-14 10:20:47 +02:00
James Lopez 9ff1990422 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-06-14 10:18:03 +02:00
James Lopez f6ed7c8ff8 missed line break 2016-06-14 10:15:20 +02:00
James Lopez fde90c3e7f better coverage for Reader 2016-06-14 10:12:41 +02:00
James Lopez 4020b0f55f few changes based on MR feedback 2016-06-13 21:18:26 +02:00
James Lopez bd5c749f29 fix file.write 2016-06-13 18:24:21 +02:00
James Lopez 9fd35740b8 refactored notes logic 2016-06-13 17:09:21 +02:00
James Lopez 833dc3204d few more changes based on feedback 2016-06-13 16:55:51 +02:00
James Lopez f4d762d7c2 addressing MR feedback, few changes to members mapper 2016-06-13 16:12:40 +02:00
James Lopez e5cf4cd745 corrected a few warnings 2016-06-13 15:33:28 +02:00
James Lopez 6f0c503397 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-06-13 13:44:00 +02:00
James Lopez 86e4751011 fixed deprecation warning 2016-06-13 13:42:30 +02:00
James Lopez b07dc938b9 fixed specs and refactored a few things due to recent model changes and merge conflicts 2016-06-13 13:34:36 +02:00
James Lopez ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 
# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb
 2016-06-13 12:43:25 +02:00
James Lopez cc32260394 added comments to import export reader class 2016-06-13 12:32:15 +02:00
James Lopez 069bc26418 refactored loads of things due to commits to pipeline change 2016-06-13 10:55:54 +02:00
James Lopez 771f735109 few more modifications based on comments 2016-06-13 09:37:58 +02:00
James Lopez e2c95c07a4 Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-06-13 09:22:33 +02:00
Robert Speicher 06a99cf7ea Merge branch 'bug/svg_sanitizer' into 'master' 
Improve SVG sanitizer to handle namespaced attributes

* Small refactor in the SVG sanitizer
* Enable already whitelisted namespaced attributes to be allowed
* Disable `xlink:href`to reference any external resource

Fixes #18100 

See merge request !4427
 2016-06-13 03:25:01 +00:00
Gabriel MazettoandRobert Speicher 7c87dac5f1 Improved SVG sanitizer specs to include smoke tests for clean. 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher a9eaa20dcb Refactored SVG sanitizer 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher 388f6eaaa6 Added SVG sanitizer fix to the changelog 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher 13791c6704 Refactor SVG sanitizer and prevent xlink:href to refer to external resources 2016-06-12 21:05:58 -04:00
Gabriel MazettoandRobert Speicher 02b882418a Fix SVG whitelisting to allow namespaced attributes 2016-06-12 21:05:57 -04:00
Robert Speicher 8d243f9bda Merge branch 'fix-closes-issues-error-500' into 'master' 
Fix Error 500 when using closes_issues API with an external issue tracker

Closes #18484

See merge request !4608
 2016-06-12 19:26:29 +00:00
Stan Hu a85dde9182 Fix Error 500 when using closes_issues API with an external issue tracker 
Closes #18484
 2016-06-11 19:50:08 -07:00
Dmitriy Zaporozhets 714a60b45c Merge branch 'nav-offscreen-dz-patch' into 'master' 
Improvements to offscreen navigation

Improvements on top of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4579 based on mockups from https://gitlab.com/gitlab-org/gitlab-ce/issues/18417#note_12389766

See merge request !4607
 2016-06-11 09:25:35 +00:00
Dmitriy Zaporozhets f3cbd4bbb6 Merge branch '18417-nav-offscreen' into 'master' 
Resolve "Hide Left sidebar paradigm"

## What does this MR do?
Hides the nav bar by default & centers the tanuki logo in the top nav

## Why was this MR needed?
UX

## What are the relevant issue numbers?
Closes #18417 

## Screenshots (if relevant)
![Screen_Shot_2016-06-10_at_12.49.10_PM](/uploads/c281e4c9de1c1bc9af59ebfa8d2bd18b/Screen_Shot_2016-06-10_at_12.49.10_PM.png)
![Screen_Shot_2016-06-10_at_12.49.27_PM](/uploads/635e0a88230105faa5527f6632899ddb/Screen_Shot_2016-06-10_at_12.49.27_PM.png)
<img src="/uploads/3001a9c723037012f1b86cfacfb1225e/Screen_Shot_2016-06-10_at_12.51.41_PM.png" width="500px">

See merge request !4579
 2016-06-11 08:43:21 +00:00
Dmitriy Zaporozhets a46b4f11d5 Center layout navigation and remove icons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-11 11:30:53 +03:00
Dmitriy Zaporozhets 0cdfa8a916 Merge branch '18463-search-form-padding-is-too-damn-high' into 'master' 
Fixed search form padding

## What does this MR do?

Corrects the padding of the search form.

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

Ney.

## Why was this MR needed?

UX

## What are the relevant issue numbers?

Closes #18463.

## Screenshots (if relevant)

![Screen_Shot_2016-06-10_at_14.07.32](/uploads/e4d127c66cf7fa3286279367d6e4ea7c/Screen_Shot_2016-06-10_at_14.07.32.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
- [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 !4591
 2016-06-11 07:44:32 +00:00
Robert Speicher ff345f8ba1 Merge branch 'create-backup-dir-for-local' into 'master' 
Only create the backup directory if it is local

Closes #12710

See merge request !4551
 2016-06-10 20:08:23 +00:00
Annabel Dunstone 3e28d04cce Fix preferences_spec test 2016-06-10 15:08:13 -05:00
Annabel Dunstone 630aeb31eb Add back sidebar counters and username 2016-06-10 12:39:58 -05:00
Stan Hu f03df22815 Only create the backup directory if it is local 
Closes #12710
 2016-06-10 10:17:54 -07:00
Robert Speicher b4e84809e8 Merge branch 'finding-multiple-projects-by-paths' into 'master' 
Add Project.where_paths_in

In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4410 I'm working on reducing the SQL queries needed to render Markdown. One reason for the large amount of queries is executing a large number of queries needed to find projects and related data. Basically `Project.find_with_namespace` is called in a loop and then any relations have to be retrieved separately.

By using `Project.where_paths_in` we can work around this by doing something like:

```ruby
project_paths = [...] # populated by some method
projects = Project.where_paths_in(project_paths).includes(:namespace, ...)
```

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/18042

See merge request !4535
 2016-06-10 17:17:19 +00:00
Robert Speicher 9c96074c0e Merge branch 'changelog-search-arrow-keys' into 'master' 
Changelog fix for search dropdown arrow keys fix

[ci skip]

See merge request !4580
 2016-06-10 17:05:59 +00:00
Robert Speicher ed87e6c680 Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' into 'master' 
Remove unused MergeRequest#gitlab_merge_status method

Closes #18462.

See merge request !4593
 2016-06-10 17:04:53 +00:00
Annabel Dunstone 67a18f34e9 Fix safari logo loading animation safari bug 2016-06-10 12:01:51 -05:00
Annabel Dunstone cb126995aa Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container 2016-06-10 12:01:51 -05:00
Annabel Dunstone 9662a5e3df Update media queries 2016-06-10 12:01:51 -05:00
Annabel Dunstone 5957fdc493 Fix profile test 2016-06-10 12:01:51 -05:00
Annabel Dunstone ade0a4af8b Fix logo at all screen widths, update sidebar text 2016-06-10 12:01:51 -05:00
Annabel Dunstone a1fbdbb6b1 Move tanuki icon to center of nav bar; keep nav closed by default; remove collapsed nav cookie 2016-06-10 12:01:51 -05:00
Dmitriy Zaporozhets 8f3c0490dd Merge branch 'labels-placement' into 'master' 
Move Labels and Milestones as sub tab to Issues/MR

## What does this MR do?

UI/UX change. Moves project labels and milestone tabs under Issues and Merge request tabs. 

## Why was this MR needed?

To solve problem of having to many tabs in top navigation. Since Labels and Milestones depends on Issue/MR feature it belongs to it and can be removed from top nav.

## What are the relevant issue numbers?

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

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - not needed
- [x] API support added - not needed
- [x] Tests
  - [x] Added for this feature/bug - changed existing tests to match new behaviour
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)

cc @jschatz1 @annabeldunstone @skyruler

See merge request !4592
 2016-06-10 16:57:13 +00:00
Rémy Coutable a1db70770e Remove unused MergeRequest#gitlab_merge_status method 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-10 18:42:03 +02:00
Robert Speicher 37be2007f9 Merge branch 'workhorse-helpers' into 'master' 
Add workhorse controller and API helpers

Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with.

See merge request !4486
 2016-06-10 16:21:26 +00:00
Dmitriy Zaporozhets 308bb56781 Add CHANGELOG item for labels/milestones navigation change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-10 19:15:23 +03:00
Dmitriy Zaporozhets 95f15b14d1 Render issues link on issues subnav unless you visit merge request controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-10 19:15:23 +03:00
Dmitriy Zaporozhets d4b2f5d0f3 Render only issues/mr in subnav depends on context 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-10 19:15:23 +03:00
Dmitriy Zaporozhets 1976a44649 Move Labels and Milestones as sub tab to Issues/MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-10 19:15:23 +03:00