home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,847 Commits 48 Branches 340 Tags
1ff3d083dd324bbec8eb70ef93d89345682d57c4
Commit Graph
20847 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher 1ff3d083dd Merge branch 'fix_jenkins_service_params' into 'master' 
Fix Jenkins CI parameters

Fixes #45

### Expected behavior

Multi-project and unstable Jenkins CI parameters should be successfully enabled and persisted if the boxes are checked.

### Observed behavior

If either of these checkboxes were selected and saved they were not persisted to the database. This is because the parameters were not in the list of allowed parameters in the controller.

See merge request !30
 2015-10-11 23:27:09 +00:00
Douwe Maan 3e71e56856 Merge branch 'add_issues_template' into 'master' 
add issues template

This MR implements an issues template that can be set for a project.

![settings_issues_template](https://gitlab.com/gitlab-org/gitlab-ee/uploads/51c3b9cd82cbb2dfdce80ed5c0a406c3/settings_issues_template.png)  
![new_issue_issues_template](https://gitlab.com/gitlab-org/gitlab-ee/uploads/cd7d44440223923db676b88edd412eb9/new_issue_issues_template.png)

This closes gitlab-org/gitlab-ce#1378

@JobV @sytses you owe me a 🍺  😉 

This MR is only marked as WIP because the tests are still running and the `CHANGELOG` hasn't been updated to 8.1 yet.



See merge request !28
 2015-10-08 19:36:36 +00:00
Hannes Rosenögger 926d3c9d6d remove placeholders 2015-10-08 18:20:53 +02:00
Drew Blessing 9279c1479a Fix Jenkins CI parameters 2015-10-08 10:50:43 -05:00
Hannes Rosenögger ba8464bed2 add issues template 2015-10-08 16:49:21 +02:00
Dmitriy Zaporozhets 086bf47eb0 Merge branch 'master' into 'master' 
Addresses regression with jenkins setup that does not use the multiproject setup

The Jenkins Gitlab Hook Plugin allows for two kinds of setups.  One where a Jenkins job is created for each branch and one where all branches are built in a single Jenkins job.  MR !9 added support for the multi-job setup but broke the single job setup.  This request addresses #30 and fixes the regression.

See merge request !27
 2015-10-01 11:59:22 +00:00
Chris Rohr f80ca51b3b Cleaned up conditional syntax 2015-10-01 07:01:01 -04:00
Chris Rohr 6c6c7c3c43 Addresses regression with jenkins setup that does not use the multiproject setup 2015-09-28 22:01:52 -04:00
Dmitriy Zaporozhets 5487802246 Merge branch 'kerb-id-lookup' into 'master' 
Look up Kerberos identity without the @REALM if a lookup for the full UPN did not find the identity.

Proposed fix for the issue reported as #34.

See merge request !26
 2015-09-25 12:13:03 +00:00
kkm e0d5c592e5 Look up Kerberos identity without the @REALM if a lookup for the full UPN did not find the identity. 2015-09-24 21:57:31 -07:00
Robert Speicher 56fee497df Merge branch 'rs-changelog' into 'master' 
Update CHANGELOGs

[ci skip]

See merge request !25
 2015-09-22 16:58:55 +00:00
Robert Speicher 31b37a1a58 Update CHANGELOG-EE 
[ci skip]
 2015-09-22 12:57:16 -04:00
Robert Speicher 05ae585c91 Sync CHANGELOG with CE 2015-09-22 12:56:39 -04:00
Dmitriy Zaporozhets e5752d9f57 Merge branch 'ce-to-ee' into 'master' 
CE to EE



See merge request !490
 2015-09-22 11:54:15 +00:00
Dmitriy Zaporozhets 80a983b492 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-22 12:25:41 +02:00
Dmitriy Zaporozhets 8ae026a6e6 Merge branch 'fix-ci-permissions' into 'master' 
Fix CI permissions

![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png)

This fixes two problems:
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users



See merge request !1379
 2015-09-22 07:54:11 +00:00
Marin Jankovski 548b7ce804 Merge branch 'fix-ci-migration-docs' into 'master' 
Add missing rake and change nginx config for CI migration

/cc @marin

See merge request !1385
 2015-09-22 07:51:36 +00:00
Kamil Trzcinski 156ace4778 Add missing rake and change nginx config for CI migration 2015-09-22 09:45:52 +02:00
Robert Speicher eb5fd3f86b Merge branch 'rs-ci-migration-guide' into 'master' 
Reformat and copy edit the CI-to-CE migration guide

[ci skip]

See merge request !1335
 2015-09-22 02:11:35 +00:00
Robert Speicher 524381dcf0 Add note about automatically re-enabling CI during migrate task 
[ci skip]
 2015-09-21 21:19:09 -04:00
Robert Speicher 34e43c1a62 Merge branch 'tweak-more-css-for-md-preview' into 'master' 
Tweak remaining CSS for Markdown preview

See merge request !1383
 2015-09-22 01:15:09 +00:00
Robert Speicher da54661bbc Remove unintended linebreak 2015-09-21 21:10:50 -04:00
Robert Speicher 541d08b8f6 Be consistent about "only required for manual install" notes 2015-09-21 21:10:16 -04:00
Robert Speicher 96fd255597 More migration guide updates 
- Rename "Finishing Up" to "Nginx configuration"
- Add fourth "Finishing Up" section
- Add Troubleshooting section with a link to backup restoration docs
- Change a few indented blocks into fenced blocks so they're highlighted
  properly.
- Added Marin's suggestions for CI-to-CE-on-different-server section.
 2015-09-21 18:51:01 -04:00
Robert Speicher 7fa0c793d2 Whitespace 2015-09-21 18:02:50 -04:00
Stan Hu 0346e9724a Tweak remaining CSS for Markdown preview 
Missed a few items in !1378
 2015-09-21 14:08:26 -07:00
Robert Speicher c1399cbc66 Merge branch 'rs-fix-spec-warnings' into 'master' 
Ensure raise_error expectations provide arguments

See merge request !1381
 2015-09-21 20:54:14 +00:00
Kamil Trzcinski 12969a14dd Add commands for Omnibus installation 2015-09-21 22:47:33 +02:00
Robert Speicher ba71542a5a Merge branch 'fix-issue-2593' into 'master' 
Fix Error 500 when comparing non-existing branches

Closes #2593

See merge request !1355
 2015-09-21 20:46:15 +00:00
Kamil Trzcinski 157ee6623c Update guide 2015-09-21 22:36:33 +02:00
Stan Hu ac289687a9 Merge branch 'fix-dangling-milestone-ids' into 'master' 
Remove deleted milestones from merge requests

This is related to !1348 but thought it would be useful as a separate MR. This MR removes deleted milestone IDs from any merge request.

Closes https://github.com/gitlabhq/gitlabhq/issues/9643

See merge request !1350
 2015-09-21 19:43:23 +00:00
Robert Speicher d4acda1253 Merge branch 'rs-relative-link-up-one' into 'master' 
Allow relative links to go up one directory level

See merge request !1352
 2015-09-21 19:38:37 +00:00
Robert Speicher 2f88459297 Ensure raise_error expectations provide arguments 2015-09-21 15:35:29 -04:00
Stan Hu 24a0e86dd3 Remove deleted milestones from merge requests 
Closes https://github.com/gitlabhq/gitlabhq/issues/9643
 2015-09-21 12:05:01 -07:00
Robert Speicher d4a960161e Merge branch 'rename-reply-by-email' into 'master' 
Rename reply_by_email to incoming_email to prepare for the future.

Closes #2579.

See merge request !1367
 2015-09-21 18:52:13 +00:00
Kamil Trzciński 534e548d44 Merge branch 'ci-import-improvements' into 'master' 
CI import improvements



See merge request !1369
 2015-09-21 18:33:42 +00:00
Dmitriy Zaporozhets cbdee053b4 Merge branch 'fix-ci-handling' into 'master' 
Fixed MR handling when GitLab CI project is not present

This is copy of !1371

/cc @jacobvosmaer @vsizov @dzaporozhets



See merge request !1373
 2015-09-21 18:29:29 +00:00
Kamil Trzcinski 071ae2619c Update CHANGELOG 2015-09-21 20:28:56 +02:00
Kamil Trzcinski 68cdeb71d5 Fix permissions problems 
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users
 2015-09-21 20:28:56 +02:00
Robert Speicher cacc70daf4 Merge branch 'fix-note-edit-preview-css' into 'master' 
More tweaks to make note edit/preview CSS consistent

Closes #2585

See merge request !1378
 2015-09-21 18:18:55 +00:00
Dmitriy Zaporozhets cc851b04c0 Merge branch 'fix-mr-without-refs' into 'master' 
Fetch merge request ref if it is missing when visit MR page

This will fix merge problem for merge requests between forks created
before 8.0

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Needed for 8.0

Fixes #2580 

See merge request !1377
 2015-09-21 17:13:29 +00:00
Stan Hu ef2fb20135 More tweaks to make note edit/preview CSS consistent 
Closes #2585
 2015-09-21 10:11:58 -07:00
Sytse Sijbrandij 534bd0f87d Fix grammar 2015-09-21 16:43:43 +00:00
Dmitriy Zaporozhets e0a23791d3 Merge branch 'fix-milestone-destroy-in-mr' into 'master' 
Remove milestones from merge requests when milestones are deleted

Destroying a milestone does not remove it from existing merge requests. This MR fixes that.

Requires f4816372 to pull in as well.

Reported by https://github.com/gitlabhq/gitlabhq/issues/9643

See merge request !1348
 2015-09-21 16:21:12 +00:00
Dmitriy Zaporozhets 39ed04c7b5 Merge branch 'repo-size-link' into 'master' 
Link project repo size to files



See merge request !1374
 2015-09-21 15:24:26 +00:00
Dmitriy Zaporozhets ea64ba1fe3 Merge branch 'remove-project-panel-ci-button' into 'master' 
Remove CI button from project home panel

Since we already have a "Continuous Integration" item in the sidebar now, I don't think we need "CI" on the project page.


See merge request !1372
 2015-09-21 14:44:52 +00:00
Dmitriy Zaporozhets de729a1e9c Merge branch 'ci-nav-fw' into 'master' 
Use fixed-width icons in CI nav sidebar.



See merge request !1376
 2015-09-21 14:41:56 +00:00
Dmitriy Zaporozhets f4a87d9f18 Merge branch 'ci-nav-commits-count' into 'master' 
Use consistent styling for number of commits in CI nav sidebar

Before:

![Screen_Shot_2015-09-21_at_15.00.28](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9005f606842936d415a3b67890b8af88/Screen_Shot_2015-09-21_at_15.00.28.png)


After:

![Screen_Shot_2015-09-21_at_15.00.43](https://gitlab.com/gitlab-org/gitlab-ce/uploads/08c897b65f82fab5f2c386a0d21c64af/Screen_Shot_2015-09-21_at_15.00.43.png)


See merge request !1375
 2015-09-21 14:41:31 +00:00
Dmitriy Zaporozhets 3a001a9290 Fetch merge request ref if it is missing when visit MR page 
This will fix merge problem for merge requests between forks created
before 8.0

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-21 16:25:59 +02:00
Stan Hu ea5c25bb4e Remove milestones from merge requests when milestones are deleted 
Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
 2015-09-21 07:00:55 -07:00