home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamil Trzcinski 157ee6623c Update guide 2015-09-21 22:36:33 +02:00
Hannes Rosenögger 3a4c5986fb clarify confirmation text on user deletion. 2015-09-21 22:05:13 +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
Jared Szechy 4e2bb80fb3 FogBugz Import: Closed comments may contain user data 2015-09-21 10:49:44 -04: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
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 Jankovski f9befb2ab8 Merge branch 'ci-migrate-version-fix' into 'master' 
Use GitlabCi::VERSION when checking migration



See merge request !1368
 2015-09-21 08:36:08 +00:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Kamil Trzcinski ee0f1c00b1 Use GitlabCi::VERSION when checking migration 2015-09-21 10:33:35 +02:00
Marin Jankovski d2c90d7494 Merge branch 'optimize-ci-tags-migration' into 'master' 
CI migration rake task for GitLab CE

- Uses backup format for final GitLab CI 8.0
- Highly optimized tags migration SQL queries


See merge request !1365
 2015-09-21 08:26:06 +00:00
Kamil Trzcinski a37e591e74 Use INSERT INTO to insert tags 2015-09-21 10:07:53 +02:00
Dmitriy Zaporozhets 8bb3215d54 Merge branch 'fail-ci-builds-without-yml' into 'master' 
Fail ci builds without yml

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551

See merge request !1349
 2015-09-21 07:49:18 +00:00
Douwe Maan 46173ec8ce Merge branch 'fix-markdown-links-in-dashboard' into 'master' 
Fix Markdown links not showing up in dashboard activity feed

Closes #2586

See merge request !1353
 2015-09-21 07:24:19 +00:00
Robert Speicher ca45e925df Merge branch 'reply-by-email-diff' into 'master' 
Fix reply by email for comments on a specific line in a diff/commit.

Fixes #2363.

See merge request !1364
 2015-09-21 00:51:53 +00:00
Robert Speicher 2b94f5fb06 Allow RelativeLinkFilter to go up multiple directories 2015-09-20 19:21:33 -04:00
Robert Speicher d511edc952 More migration guide updates 
Fixes a few links and typos, and reorganizes the CI "Create a backup"
section.
 2015-09-20 18:58:09 -04:00
Kamil Trzcinski b2a9021685 Change wording 2015-09-21 00:42:25 +02:00
Kamil Trzcinski 098c198271 Disable CI for time of migration 2015-09-21 00:14:07 +02:00
Kamil Trzcinski 500e277a83 Change notices during migrating 2015-09-21 00:13:58 +02:00
Kamil Trzcinski fc8ae32bce Update migration guide 2015-09-20 23:45:35 +02:00