home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,505 Commits 48 Branches 340 Tags
0695cdee178ac995f7dec81dcd734eef7e28e36e
Commit Graph
28505 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis 0695cdee17 Add assumptions section and refactor domain configuration 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 04d231ef87 Rearrange configuration parts 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 63c1792efa Rearrange headings 2016-05-22 14:47:52 -05:00
Marin JankovskiandAchilleas Pipinellis 18dddc0c84 Initial docker container registry configuration docs. 2016-05-22 14:47:52 -05:00
Jeroen van Baarsen 529c582130 Merge branch 'remove_email_in_group_doc' into 'master' 
fix group members api doc: remove emial

"Email" is removed in ae564c97d4

See merge request !4232
 2016-05-22 15:14:33 +00:00
Achilleas Pipinellis ef17465412 Merge branch 'health_check_docs' into 'master' 
Add health check feature documentation

for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3888

@virtuacreative @axil 

See merge request !4199
 2016-05-22 06:34:47 +00:00
Achilleas Pipinellis 2264bb136b Copyedit health check docs 2016-05-22 00:41:20 -05:00
Yorick Peterse 5a02f28a1b Merge branch 'fix-docker-registry-integration' into 'master' 
Fix docker registry integration

See merge request !4229
 2016-05-21 22:57:39 +00:00
Jeroen van Baarsen 024ddf6ea4 Merge branch 'gitignore-readme' into 'master' 
Add README for updating .gitignore templates

Add notes to make it clear that users should not file a MR against a specific file here.

See merge request !4227
 2016-05-21 15:00:45 +00:00
Jeroen van Baarsen f1a98383e3 Merge branch 'patch-1' into 'master' 
fix user.name length in milestones participants tab

Spelling mistake of "length"

See merge request !4206
 2016-05-21 14:52:55 +00:00
Sanster 69a07cf4d4 fix group members api doc: remove emial 2016-05-21 22:33:54 +08:00
Kamil Trzcinski c6411a785b Update CHANGELOG 2016-05-21 01:18:10 -05:00
Tony Chu ad13d357e7 fix user.name length in milestones participants tab 2016-05-21 13:52:38 +08:00
Jacob Schatz aa060e68ee Merge branch 'dz-fix-fork-counter' into 'master' 
Fix fork counter ui bug for safari

## What does this MR do?

Fixes UI bug on safari when fork button has blue arrow

## Screenshots 

![Screenshot_2016-05-19_22.10.21](/uploads/d923d8fc6bc12ee8f7052390bd5d7c51/Screenshot_2016-05-19_22.10.21.png)![Screenshot_2016-05-19_22.09.38](/uploads/130eb8b4a09b2ba5b7c5a83fed543dbf/Screenshot_2016-05-19_22.09.38.png)

See merge request !4221
 2016-05-21 03:36:36 +00:00
Jacob Schatz 73403c4ca7 Merge branch 'issuable-new-due-date' into 'master' 
Issuable form due date

For some reason, this was never in the original merge request for due date?

![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png)

Closes #15516

See merge request !3895
 2016-05-21 03:34:43 +00:00
Stan Hu 4460598896 Add README for updating .gitignore templates 2016-05-20 20:53:17 -05:00
Jacob Schatz 98b1daf32d Merge branch 'dropdown-enter-select' into 'master' 
Fixed issue with enter key selecting wrong option in dropdown

If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif)

Closes #17630

See merge request !4210
 2016-05-21 00:11:18 +00:00
Jacob Schatz 9aab0f0973 Merge branch 'merge-immediately-button-color-fix' into 'master' 
Fixed issue with merge button color

![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png)

Closes #17644

See merge request !4211
 2016-05-21 00:08:23 +00:00
Jacob Schatz 535252005e Merge branch 'fix/style-empty-groups' into 'master' 
Wrap "No groups found" message with a .nothing-here-block

The "No groups found" message's style is inconsistent with the other empty messages.

## Screenshots

### Empty groups
![Screen_Shot_2016-05-13_at_13.40.34](/uploads/1447c5f60cde7d50d6f8f07c41704e5c/Screen_Shot_2016-05-13_at_13.40.34.png)

### Empty projects
![Screen_Shot_2016-05-13_at_13.40.30](/uploads/c21ff093f3d6bdbafecf7b075fa33d3c/Screen_Shot_2016-05-13_at_13.40.30.png)

See merge request !4137
 2016-05-21 00:07:08 +00:00
Kamil Trzcinski 4474eab4f6 Fix container deletion permission issue 2016-05-20 18:43:11 -05:00
Douwe Maan ec86644545 Merge branch 'zj-gitignore-dropdown' 2016-05-20 17:14:22 -05:00
Douwe Maan baccd1838c Merge branch 'rm-source-branch' into 'master' 
Allows MR authors to have the source branch removed when merging the MR


closes #13191 

The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously.

Screenshot:
![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png)

See merge request !2801
 2016-05-20 21:41:02 +00: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 63f53730c0 Merge branch 'issue_14684_2' into 'master' 
current_user.confirmed_at.present? => current_user.confirmed?

fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41

See merge request !4225
 2016-05-20 21:09:49 +00: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
Douwe Maan 983b592cb7 Merge branch 'issue_14632' into 'master' 
Fix group visibility level migration in case all visibility levels are restricted

fixes #14632 

See merge request !4107
 2016-05-20 21:05:18 +00:00
Douwe Maan a97cb8f8b8 Merge branch 'issue_9013' into 'master' 
Let users set notification levels in projects which they are not members

Fixes #9013 

See merge request !3986
 2016-05-20 21:04:55 +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
Alfredo Sumaran 1f5fcb638d Dropdown implementation 2016-05-20 15:58:36 -05:00
Zeger-Jan van de WegandAlfredo Sumaran fab9dbb3eb First import of gitignores 
Add .gitignore dropdown when creating a new .gitignore file

Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
 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
Douwe Maan 56eb42007a Merge branch 'issue-17537-fix' into 'master' 
Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref

Closes #17537

See merge request !4151
 2016-05-20 20:46:06 +00:00
Douwe Maan f9cf65a6c4 Merge branch 'rs-issue-3055' into 'master' 
Use extended regexp flag for `git grep`-ing files

Closes #3055

See merge request !4203
 2016-05-20 19:56:23 +00:00
Felipe Artur f04c5b27f0 current_user.confirmed_at.present? => current_user.confirmed? 2016-05-20 13:52:42 -04:00
DJ Mountney 1a98dcacc5 Fix grammar in health_check.md 
A access token -> An access token
 2016-05-20 17:24:06 +00:00
Robert Speicher 5d031c868a Merge branch 'fix/url-refactor-from-ee' into 'master' 
Update CE code to include some refactor done in EE to do with import url

This is simply updating the code to match EE and avoid further conflicts related to `import_data` and `import_url` changes made on EE only.

See merge request !4223
 2016-05-20 17:10:28 +00:00
Jeroen van Baarsen c5a5d54842 Merge branch 'update-db-schema' into 'master' 
Updated the DB schema

This updates `db/schema.rb` which apparently wasn't fully updated in the recent merge requests.

See merge request !4222
 2016-05-20 16:18:32 +00:00
James Lopez 341c1181d9 refactor project to include some nicer EE stuff 2016-05-20 14:55:27 +02:00
Jeroen Jacobs 7880a300dc Allows MR authors to have the source branch removed when merging the MR 2016-05-20 11:30:03 +02:00
Phil Hughes f307ff3413 Replaced line breaks 2016-05-20 09:11:28 +01:00
Phil Hughes 9f60a2eda2 Fixed issue with enter key selecting wrong option in dropdown 
If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

Closes #17630
 2016-05-20 08:50:42 +01:00
Phil Hughes ce8dd3bd66 Fixed issue with merge button color 
Closes #17644
 2016-05-20 08:50:09 +01:00
Yorick Peterse 1472bb9247 Updated the DB schema 2016-05-19 23:13:51 -05:00
Dmitriy Zaporozhets a768c04ba5 Fix fork counter ui bug for safari 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-19 22:09:51 -05:00
Felipe Artur 260a915cb0 Fix group visibility level migration in case all visibility levels are restricted 2016-05-19 20:08:08 -04:00
Felipe Artur 6fb9bf87c4 Use the right default notification settings for non members 2016-05-19 19:47:07 -04: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
Rémy Coutable f73def90a8 Merge branch 'fix-ci-commit-creation' into 'master' 
Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios

## What does this MR do?

If we use a new `project.ci_commits` it will add it to array, and some other services which can do a save on a project can lead to a scenario when `ci_commit` will be saved, where it should not be.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/support-forum/issues/717 https://gitlab.com/gitlab-com/support-forum/issues/715 https://gitlab.com/gitlab-org/gitlab-ce/issues/17596 https://gitlab.com/gitlab-com/support-forum/issues/714 https://gitlab.com/gitlab-org/gitlab-ce/issues/13402

cc @rymai 


See merge request !4214
 2016-05-19 21:42:24 +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