home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,591 Commits 48 Branches 340 Tags
cdec9e472db581acbee72cdcaa703e4155cb4cfb
Commit Graph
4198 Commits
Author SHA1 Message Date
Kamil Trzcinski cdec9e472d Replace \n to <br> 2016-05-23 21:59:07 -05:00
Robert Speicher 43d9e06b68 Add rubocop-rspec 
Almost all cops are starting as disabled until we can fix their
violations.
 2016-05-23 15:59:32 -04:00
Robert Speicher 18ac02a3fe Merge branch 'rs-space-around-keyword' into 'master' 
Enable Style/SpaceAroundKeyword cop and fix offenses

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

See merge request !4259
 2016-05-23 19:29:25 +00:00
Robert Speicher 42aca7df08 Merge branch 'rs-range-include' into 'master' 
Enable Performance/RangeInclude cop and fix single offense

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

See merge request !4255
 2016-05-23 18:25:47 +00:00
Robert Speicher 3ba72f69af Enable Style/SpaceAroundKeyword cop and fix offenses 2016-05-23 14:16:35 -04:00
Robert Speicher 51c167eeb7 Enable Performance/RangeInclude cop and fix single offense 2016-05-23 13:10:42 -04:00
Robert Speicher 013bccbd93 Enable Style/DefWithParentheses cop and fix single offense 2016-05-23 13:06:36 -04:00
Stan Hu 9bb0d0b407 Fix Error 500 in CI charts by gracefully handling commits with no durations 
Closes #17730
 2016-05-22 23:52:50 -07:00
Achilleas Pipinellis 399d5e723a Merge branch 'registry_admin_docs' into 'master' 
Docker container registry configuration docs.

Part of gitlab-org/omnibus-gitlab!764 and gitlab-org/gitlab-ce!4040

See merge request !4141
 2016-05-23 01:52:37 +00:00
Achilleas Pipinellis f55f628531 Add note about port needed in NGINX config 2016-05-22 19:20:28 -05:00
Grzegorz Bizon 7f9092da1e Extend comment for migrations helper MySQL fix 2016-05-22 23:31:33 +02:00
Grzegorz Bizon 2df8b48dbb Add MySQL compatibility fix in migration helpers 2016-05-22 22:44:59 +02:00
Achilleas Pipinellis c1af75192d Add NGINX config file for Registry 2016-05-22 14:54:29 -05:00
Douwe Maan ec86644545 Merge branch 'zj-gitignore-dropdown' 2016-05-20 17:14:22 -05:00
Douwe Maan fc1910ddc5 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' 
# Conflicts:
#	app/services/system_note_service.rb
 2016-05-20 16:23:04 -05:00
Douwe Maan ba5b47c2e3 Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' 
Implement special GitLab markdown reference for milestones

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:

- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829

See merge request !3897
 2016-05-20 21:08:57 +00:00
Alfredo Sumaran ab96ca2bf1 Dropdown implementation 2016-05-20 15:58:36 -05:00
Zeger-Jan van de WegandAlfredo Sumaran 79620c501d Update API and fetching task 2016-05-20 15:58:36 -05:00
Zeger-Jan van de WegandAlfredo Sumaran e166a8022a Backend for a gitignores dropdown 2016-05-20 15:58:36 -05:00
Robert Speicher f26389a02a Merge branch 'feature/runner-config-untagged-jobs' into 'master' 
Add config for CI Runner that prevents it from picking untagged jobs

Closes #3456

See merge request !4039
 2016-05-19 21:54:33 +00:00
Jeroen van Baarsen fa7a682bb0 Merge branch 'fix-generator-templates-directory' into 'master' 
Move generator templates to generator_templates/



See merge request !4217
 2016-05-19 21:24:05 +00:00
Douwe Maan 18ef054bc7 Merge branch '17464-backport-email-syntax-highlighting' into 'master' 
Syntax-highlight diffs in push emails

![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png)

Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151



See merge request !4147
 2016-05-19 21:12:53 +00:00
Grzegorz Bizon bf9cc351c2 Add minor corrections related to config of runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 0fd100d28d Improve setting default runner attrs when using API 2016-05-19 22:01:53 +02:00
Grzegorz Bizon b8cf2a340b Set run untagged option when registering a runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon da8b72d453 Extend runner options that are configurable via API 2016-05-19 22:01:53 +02:00
Yorick Peterse 9429da3ae2 Move generator templates to generator_templates/ 
Since we eager load everything in lib/ putting ERB code in .rb files
will result in syntax errors. By moving the templates to
./generator_templates we can work around this.
 2016-05-19 14:58:35 -05:00
Yorick Peterse c22be75794 Removed outdated comment from migration helpers 2016-05-19 12:36:02 -05:00
Rémy Coutable f780bac0cc Merge branch 'patch-1' into 'master' 
Fixed advice on invalid permissions on upload path

When running the checks, my upload path has wrong permissions, the advice could not fix it because it does not change the permission of this directory (only sub-directories).
```
Uploads directory setup correctly? ... no
  Try fixing it:
  sudo find /home/git/gitlab/public/uploads -type d -not -path /home/git/gitlab/public/uploads -exec chmod 0700 {} \;
  For more information see:
  doc/install/installation.md in section "GitLab"
  Please fix the error above and rerun the checks.
```

Executing this instead fixed the error :
```
sudo chmod 700 /home/git/gitlab/public/uploads
```

See merge request !2948
 2016-05-19 17:30:34 +00:00
Robert Speicher 883e2d2187 Merge branch 'migration-helpers' into 'master' 
Added helper methods for database migrations

These helpers can ultimately be used to write migrations that don't
require downtime.

See #15464 for more information.

See merge request !3860
 2016-05-19 16:49:14 +00:00
Yorick Peterse 7e7764139d Fixed typos in migration templates 2016-05-19 10:05:39 -05:00
Yorick Peterse 59640866ce Remove left-over use of strip_heredoc 2016-05-19 10:04:46 -05:00
JazzandLudovic Perrine 8eb1748ab2 Fixed advice on invalid permissions on upload path 2016-05-19 16:53:47 +02:00
Stan Hu e9ecbd3d4e Fix warning messages with SVG ALLOWED_ELEMENTS 
Eliminates "warning: already initialized constant Gitlab::Sanitizers::SVG::ALLOWED_ELEMENTS"
 2016-05-19 01:35:04 -05:00
Rémy Coutable f29d8b64e4 Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 23:40:33 -05:00
Robert Speicher 4607323e13 Merge branch 'issue_17560' into 'master' 
Mask credentials from URL when the import of project has failed.

REF: #17560 

See merge request !4185
 2016-05-19 03:00:01 +00:00
Rubén Dávila 0c47b68d04 Mask credentials from URL when import of project has failed. 2016-05-18 21:16:36 -05:00
Rémy Coutable 5341b16fc9 Reuse existing SCSS variables 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 13:20:46 -05:00
Kamil Trzciński 08fddae744 Merge branch 'docker-registry-view' into 'master' 
Add container registry support

Tasks:

- [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787
- [x] Implement Docker Registry API
- [x] Show a list of docker images in GitLab
- [x] Remove registry repository on project deletion
- [x] Support project rename, move and namespace rename
- [x] Use token when connecting the registry
- [x] Allow to delete images from GitLab
- [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN)
- [x] Support GitLab Runner pulling for public repositories
- [ ] Support GitLab Runner pulling for private repositories
- [x] Add tests for Docker Registry API
- [x] Add tests for a views
- [x] Make texts nicer
- [x] Implement a backup support

- [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141
- [ ] Create user documentation

See merge request !4040
 2016-05-18 18:19:01 +00:00
Adam ButlerandRémy Coutable 8a8b5497c5 Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff 2016-05-18 11:15:10 -05:00
Rémy Coutable f4d2a2d97b Merge branch 'fix/import-data-issue' into 'master' 
Create import data in service and fix timing issues when scheduling job

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

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

See merge request !4106
 2016-05-18 15:28:11 +00:00
Rémy Coutable da8ac1635f Merge branch 'issue_17302' into 'master' 
Fix api leaking notes when user is not authorized to read noteable

fixes #17302

See merge request !4102
 2016-05-18 04:31:12 +00:00
Felipe Artur 5bf49bb63d Move note helper method to notes entity file 2016-05-17 21:41:53 -05:00
Kamil Trzcinski 24145592e8 Provide full test coverage to lib/container_registry API implementation 2016-05-17 13:20:11 -05:00
Kamil Trzcinski a82109eee8 Add .gitkeep 2016-05-17 09:41:47 -05:00
James Lopez 4e9ce5abe2 fix typo from bad refactoring 2016-05-17 15:19:59 +02:00
Sean McGivern a9977f2b7a Syntax-highlight diffs in push emails 
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
 2016-05-17 13:23:17 +01:00
Kamil Trzcinski 91c4002a0c Improve test coverage 2016-05-16 18:03:55 -05:00
Kamil Trzcinski 143cd58c39 Added backup of container registry 2016-05-16 17:25:38 -05:00
Kamil Trzcinski eb42f95c18 Merge remote-tracking branch 'origin/master' into docker-registry-view 2016-05-16 16:15:40 -05:00