home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,537 Commits 48 Branches 340 Tags
53ad33e4ba1b079e4f2aebceb42a7301c5ce2e4a
Commit Graph
28537 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan Hu 53ad33e4ba Merge branch 'fix/application-settings-error-default-value' into 'master' 
Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources

## What does this MR do?

When upgrading to GitLab 8.8, an admin would encounter an Error 500 due to a `nil` `disabled_oauth_sign_in_sources`. This MR ensures that the value will be a blank array if empty.

Closes #17564

See merge request !4242
 2016-05-23 06:27:46 +00:00
Grzegorz BizonandStan Hu a006ff74c7 Serialize application setting as Array by default 2016-05-22 22:31:28 -07:00
Robert Speicher c135a69a87 Update CHANGELOG for 8.8.1. Again. 
[ci skip]
 2016-05-22 23:54:29 -04:00
Robert Speicher f23facabe4 Update CHANGELOG for 8.8.1 
[ci skip]
 2016-05-22 23:39:49 -04:00
Robert Speicher 3c18a4f8aa Merge branch 'fix-y2k17-problem' into 'master' 
Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value.

Static year values would have caused the test suite to fail on these in the future, so I replaced 'em.

That's pretty much all there is to this MR.

See merge request !4241
 2016-05-23 02:47:01 +00: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
Connor Shea 2bf818c4d0 Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value. 2016-05-22 19:50:49 -06:00
Achilleas Pipinellis c01f99b768 Fixes suggested by Kamil 2016-05-22 19:53:19 -05:00
Robert Speicher b0e12290ab Merge branch 'fix-access-to-pipelines-for-anonymous' into 'master' 
Allow anonymous user to access pipelines

## What does this MR do?

It fixes an issue where the Pipelines is shown for the Anonymous users,
but they get 404 when clicked. Their session is then logged out.

Fixes #17717.

See merge request !4233
 2016-05-23 00:41:50 +00:00
Achilleas Pipinellis f896a4e0c1 Refactor storage location section 2016-05-22 19:34:52 -05:00
Achilleas Pipinellis f55f628531 Add note about port needed in NGINX config 2016-05-22 19:20:28 -05:00
Achilleas Pipinellis b565cfa50f Fix remaining docs on enabling/disabling Registry 2016-05-22 18:52:42 -05:00
Grzegorz Bizon 11fa89dfa5 Move Changelog for pipeline fix to valid version 2016-05-23 01:31:51 +02:00
Kamil TrzcinskiandGrzegorz Bizon cd26cfbc27 Allow anonymous user to access pipelines 2016-05-23 01:31:51 +02:00
Stan Hu 243e9bc0d9 Merge branch 'fix-ci-login-to-registry' into 'master' 
Fix the CI login to Container Registry (the gitlab-ci-token user)

## What does this MR do?

This fixes `docker login` not succeeding when trying to do CI login: `gitlab-ci-token with $CI_BUILD_TOKEN`.

cc @marin

See merge request !4236
 2016-05-22 23:24:18 +00:00
Robert Speicher ccafa78586 Merge branch 'upgrade-activerecord-session-store' into 'master' 
Upgrade activerecord-session_store from 0.1.2 to 1.0.0.

Changelog: https://github.com/rails/activerecord-session_store/releases/tag/v1.0.0

Includes Rails 5 support, working towards the never-ending #14286.

See merge request !4238
 2016-05-22 22:40:49 +00:00
Grzegorz Bizon edfb20f2bc Move registry fix Changelog entry to valid version 2016-05-23 00:34:52 +02:00
Kamil TrzcinskiandGrzegorz Bizon 646018a40e Fix the CI login to Container Registry (the gitlab-ci-token user) 2016-05-23 00:34:51 +02:00
Achilleas Pipinellis e955f49fb7 Fix Registry docs now that it is not enabled be default 2016-05-22 17:23:30 -05:00
Stan Hu b4c47368bf Merge branch 'fix/migration-helpers-mysql-compatibility' into 'master' 
Fix MySQL compatibility in zero downtime migration helpers

## What does this MR do?

This MR fixes MySQL for zero downtime migration helpers introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3860

Closes #17711

See merge request !4239
 2016-05-22 22:20:27 +00:00
Grzegorz Bizon 891888aa05 Add Changelog entry for MySQL compatibility fix 2016-05-22 23:33:08 +02: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
Grzegorz Bizon 9e92b0eead Add specs for migration helpers and boolean values 2016-05-22 22:41:14 +02:00
Grzegorz Bizon 13bf612600 Test migration helpers using a migration class 2016-05-22 22:40:43 +02:00
Achilleas Pipinellis 27067e565f Clarify how the Registry is enabled in Omnibus 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis e9817f21f4 Major overhaul of the Registry admin docs 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis c1af75192d Add NGINX config file for Registry 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis 26c768b42c Add proper config values for Registry in gitlab.yml 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis c6cd07ba3a Add link to container registry 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 0cdc080a4a Refactor container docs 2016-05-22 14:47:52 -05:00
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