home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,118 Commits 48 Branches 340 Tags
v8.0.0
Commit Graph
19118 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski d70c051dc8 Version 8.0.0 v8.0.0 2015-09-22 10:14:06 +02:00
Marin JankovskiandMarin Jankovski bdb19ae653 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 10:03:31 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 9b6cebf9f8 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 10:03:09 +02:00
Robert Speicher 3568fd8639 Merge branch 'master' into 8-0-stable 2015-09-21 22:12:41 -04: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
Robert Speicher f3837d05b5 Version 8.0.0.rc4 v8.0.0.rc4 2015-09-21 16:35:26 -04:00
Robert Speicher e8324327c1 Merge branch 'master' into 8-0-stable 2015-09-21 16:30:15 -04: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
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
Douwe Maan 09e0f8abb4 Use fixed-width icons in CI nav sidebar. 2015-09-21 15:04:30 +02:00
Douwe Maan f935259260 Use consistent styling for number of commits in CI nav sidebar 2015-09-21 14:59:50 +02:00
Douwe Maan a9d686b2fb Link project repo size to files 2015-09-21 14:57:33 +02:00
Kamil Trzcinski ca6fd0a27d Fixed MR handling when GitLab CI project is not present 2015-09-21 14:55:02 +02:00
Douwe Maan 82edd68e55 Remove CI button from project home panel 2015-09-21 14:53:58 +02:00
Kamil Trzcinski abaa65efc1 Revert "Fixed MR handling when GitLab CI project is not present" 
This reverts commit 3abcab779e.
 2015-09-21 14:52:51 +02:00
Kamil Trzcinski 3abcab779e Fixed MR handling when GitLab CI project is not present 2015-09-21 13:53:03 +02:00
Jacob Vosmaer e0823d189f Relax CI version check during import 2015-09-21 11:46:12 +02:00
Jacob Vosmaer 25c7467ce1 Make importing builds less noisy 2015-09-21 11:42:59 +02:00
Douwe Maan 017219e7f5 Tweak text 
[ci skip]
 2015-09-21 11:42:36 +02:00
Douwe Maan 183892fde9 Merge branch 'notification-levels' into 'master' 
Notification levels can now be set on the Project's main page

![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png)

The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.

Saving is done via a remote form submission and if successful shows the user a flash message:

![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png)

@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.

@rspeicher hopefully we can include it with the 8.0 release, maybe?

/cc @darby 

See merge request !1322
 2015-09-21 09:19:32 +00:00
Marin Jankovski 2c846bbfc7 Version 8.0.0.rc3 v8.0.0.rc3 2015-09-21 11:17:38 +02:00
Dmitriy Zaporozhets 2460d290af Merge branch 'sh-fix-issue-2585' into 'master' 
Make Markdown area formatting consistent

Issue #2585 


See merge request !1354
 2015-09-21 08:57:51 +00:00
Marin JankovskiandMarin Jankovski 619f4698bb Merge branch 'ci-migrate-version-fix' into 'master' 
Use GitlabCi::VERSION when checking migration

See merge request !1368
 2015-09-21 10:37:04 +02:00