home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,132 Commits 48 Branches 340 Tags
docker-updates
Commit Graph
5097 Commits
Author SHA1 Message Date
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
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 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
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 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
Stan Hu ef2fb20135 More tweaks to make note edit/preview CSS consistent 
Closes #2585
 2015-09-21 10:11:58 -07: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
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
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
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 b2a9021685 Change wording 2015-09-21 00:42:25 +02:00
Douwe Maan 47e926bec0 Minor code cleanup 2015-09-20 19:09:43 +02:00
Dmitriy Zaporozhets 11bbc06b4b Merge branch 'style-pagination' into 'master' 
Apply new design to pagination

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

cc @skyruler 

See merge request !1362
 2015-09-20 15:43:49 +00:00
Dmitriy Zaporozhets 9fb3ef8888 Apply new design to pagination 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-19 16:22:04 +02:00
Dmitriy Zaporozhets 4daffbe406 Cleanup GitLab CI UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-19 01:40:44 +02:00
Dmitriy Zaporozhets 442db0801a Merge branch 'master' into ci-build-list 2015-09-19 00:15:49 +02:00
Dmitriy Zaporozhets b2c06bf707 Fix gitlab ci projects page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 18:32:09 +02:00
Dmitriy Zaporozhets 6776dcf90b Add colors to build labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 18:24:33 +02:00
Dmitriy Zaporozhets 2122d7b919 Merge branch 'master' into ci-build-list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 18:24:08 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Jeroen van Baarsen 1eb3dde45b Merge branch 'add-custom-text-to-help' into 'master' 
Allow custom info to be added to Help page

Fixes #2536

**Admin screen**

![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e62f3e0ff40558fb955f09e469293521/image.png)

**Text on the Help page**

![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ba315fb418e1698d8f44b88c7cc6c29a/image.png)

/cc @DouweM

See merge request !1309
 2015-09-18 09:24:15 +00:00
Dmitriy Zaporozhets f2608c41b8 Merge branch 'fix-trending-projects' into 'master' 
Fix 500 on trending projects if isntance has 100k+ projects

Fixes #2576 

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

See merge request !1341
 2015-09-18 09:18:12 +00:00
Dmitriy Zaporozhets db74db6eb6 Merge branch 'fix-ci-settings-cancel' into 'master' 
Remove Cancel button from CI Project settings

Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/2568

See merge request !1337
 2015-09-18 09:15:23 +00:00
Dmitriy Zaporozhets f937ac867d Merge branch 'project-header-titles' into 'master' 
Project header titles

Fixes my issues with !1293, see [my comment](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1293#note_2112289):

> No please, not this huge if/else statement again! This will get out of sync so quickly, like happened with the original page titles before the page_title helper per page :(

cc @haynes 

See merge request !1328
 2015-09-18 09:11:18 +00:00
Valery Sizov 3984818bb3 Merge branch 'ci_projects_order' into 'master' 
Fix: ci projects order

https://gitlab.com/gitlab-org/gitlab-ce/issues/2553

See merge request !1333
 2015-09-18 08:54:06 +00:00
Douwe Maan 5faa6e75d0 Merge branch 'master' into project-header-titles 2015-09-18 10:48:06 +02:00
Dmitriy Zaporozhets b6de7ad49e Fix 500 on trending projects if isntance has 100k+ projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 10:45:42 +02:00
Jeroen van Baarsen fe17a236e3 Allow custom info to be added to Help page 
Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-18 10:15:40 +02:00
Dmitriy Zaporozhets e86668984f Style CI project/build list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 09:44:10 +02:00
Kamil Trzcinski b53994bb9e Remove Cancel button in Project settings 2015-09-17 23:33:21 +02:00
Valery Sizov b7e49d8042 Fix: ci projects order 2015-09-17 20:12:17 +03:00
Kamil Trzciński 0aec0d53b1 Merge branch 'remove-ci-help' into 'master' 
Remove CI help

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556

See merge request !1325
 2015-09-17 16:22:24 +00:00
Kamil Trzcinski 7166f7b7cf Remove CI help 2015-09-17 17:09:10 +02:00
Stan Hu ac855e5ed3 Move partial locals out of controller 2015-09-17 07:24:45 -07:00
Kamil Trzcinski e960b3ad2c Fix nav_link for dashboard 2015-09-17 14:23:46 +02:00
Kamil Trzcinski da6d9607d1 Integrate CI navigation more tightly with project 2015-09-17 13:56:21 +02:00
Douwe Maan 7b10bd954f "Back to x" links are lowercase. 2015-09-17 12:17:13 +02:00
Douwe Maan 89fee0e35e Fix active state of CI Help nav link. 2015-09-17 12:16:53 +02:00
Douwe Maan 6043c66966 Rename "CI" in sidebar to "GitLab CI". 2015-09-17 12:16:35 +02:00
Douwe Maan d89ae7df2c Move project header title definition to view in question. 2015-09-17 12:16:24 +02:00