home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,737 Commits 48 Branches 340 Tags
d7bcfe4fc020529f9b6ed2a75dfb2f31acded080
Commit Graph
9728 Commits
Author SHA1 Message Date
Dirceu Pereira Tiegs d7bcfe4fc0 Fix issue #3055 (project search with unmatched parentheses) 2015-10-21 10:20:40 -02:00
Robert Speicher 123669a551 Merge branch 'simplify-cross-references' into 'master' 
Simplify code around (cross)-references

See merge request !1568
 2015-10-14 20:10:34 +00:00
Kamil Trzciński a3a80eac11 Merge branch 'show_pending_warning' into 'master' 
Show warning when build is pending and there are not runners

This change is based on: !1530.

This resolves #2967.



See merge request !1573
 2015-10-14 18:57:05 +00:00
Kamil Trzciński 45c0b74dc4 Merge branch 'predefined_build_variables' into 'master' 
Add a few predefined variables to CI builds

This adds CI_BUILD_TAG, CI_BUILD_STAGE, CI_BUILD_NAME and CI_BUILD_TRIGGERED to build environment.

This change is based on: !1530 

See merge request !1572
 2015-10-14 18:55:59 +00:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Kamil Trzcinski d9e2232f63 Fix warning sign 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 7af4f5215e Show warning if build doesn't have runners with specified tags or runners didn't connect recently 
Slightly refactor runner status detection: moving it to Runner class

Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 5807419519 Use tag? instead of tag to indicate that this is boolean 2015-10-14 17:28:17 +02:00
Kamil Trzcinski 7b5ab3ded5 Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI builds 2015-10-14 17:28:17 +02:00
Valery Sizov 6c1faf4b33 Merge remote-tracking branch 'origin/inified_404_error' 2015-10-14 18:21:27 +03:00
Kamil Trzciński 3b93d37e78 Merge branch 'fix-retry-and-cancel' into 'master' 
Fix retry and cancel for build

This fixes some regressions introduced by Commit Status API

See merge request !1586
 2015-10-14 13:40:33 +00:00
Douwe Maan 07101cfab6 Merge branch 'fix_issue_2906' into 'master' 
+ and Titleize New Project button on dashboard

Hello there. Its my first merge request in open source world. So please be tolerant to me if i do something wrong.

I try to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/2906

See merge request !1564
 2015-10-14 12:14:31 +00:00
Kamil Trzcinski 33c9d6e45c Fix retry and cancel for build 2015-10-14 12:56:52 +02:00
Douwe Maan 276b3a7bc2 Make Mentionable#cross_reference_exists? private. 2015-10-14 09:27:39 +02:00
Dmitriy Zaporozhets 52983a84b9 Merge branch 'stanhu/gitlab-ce-wiki-add-new-page-in-pages-tab' 2015-10-13 20:32:06 +02:00
Dmitriy Zaporozhets 1a57fbc437 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-10-13 20:31:11 +02:00
Dmitriy Zaporozhets 989928eca3 Merge branch 'gfm-commit-size' 2015-10-13 20:30:57 +02:00
Stan Hu e0072892e8 Merge branch 'add-wip-to-mr-hook-attrs' into 'master' 
merge_request: add work_in_progress to MR hooks



See merge request !1443
 2015-10-13 17:12:51 +00:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Douwe Maan 135ec3242d Reduce font size of commit references to not stand out as much 2015-10-13 18:41:29 +02:00
Dmitriy Zaporozhets c9c538469c Merge branch 'redesign-files-page' 2015-10-13 17:48:46 +02:00
Dmitriy Zaporozhets 1907f25944 Merge branch 'group_names_widget' into 'master' 
Project names are not fully shown if group name is too big, even on group page view

https://dev.gitlab.org/gitlab/gitlabhq/issues/2548


![joxi_screenshot_1444408109183](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c21ae245254b82db0212298b6f997067/joxi_screenshot_1444408109183.png)


See merge request !1561
 2015-10-13 15:20:05 +00:00
Dmitriy Zaporozhets a0a488ed13 Apply new design to files page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 16:41:48 +02:00
Kamil Trzciński e3edd53ae4 Merge branch 'commit_status' into 'master' 
Implement Commit Status API

This is preliminary implementation of Commit Status API, pretty much compatible with GitHub.

1. The Commit Statuses are stored in separate table: ci_commit_status.
2. The POST inserts a new row.
3. To POST execute GitLab API `post :id/repository/commits/:sha/status`. This accepts dual authorization:
- Using authorized user
- Using ci-token to allow easy posting from CI Services
4. This adds predefined variable to GitLab CI build environment: CI_BUILD_STATUS_URL, allowing to easy post status from within build (ex. with code coverage or other metrics).
5. This adds statuses to commit's builds view.
6. The commit's status is calculated taking into account status of all builds and all posted statuses.
7. The commit statuses doesn't trigger notifications.
8. The commit status API introduces two new privileges: `read_commit_statuses` and `create_commit_status`.
9. We still miss a few tests and documentation updates for API and CI.

@dzaporozhets @sytses What do you think?




See merge request !1530
 2015-10-13 14:33:00 +00:00
Dmitriy Zaporozhets 2f68fb9cc3 Small css cleanup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 14:52:20 +02:00
Dmitriy Zaporozhets e75655950d Several fixes for UI on mobile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 13:37:15 +02:00
Dmitriy Zaporozhets 219451241a Fix UI issue on project page with no ssh key message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 13:03:27 +02:00
Dmitriy Zaporozhets 4ad61519f9 Fix control buttons in lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 13:02:27 +02:00
Kamil Trzcinski e7cc554cc1 Fix retry and cancel URLs 2015-10-13 11:51:08 +02:00
Dmitriy Zaporozhets ab604c73ef Temporary return sm and xs button sizes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 11:33:46 +02:00
Dmitriy Zaporozhets f1e3894973 Remove unused twbs components 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 11:23:10 +02:00
Dmitriy Zaporozhets 029edcc391 Fix padding for controls in list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 11:02:44 +02:00
Dmitriy Zaporozhets e4a9447451 Rename bootstrap css file and refactor typography css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-13 10:55:06 +02:00
Dmitriy Zaporozhets b128d89a35 Merge branch 'refactor-styles' into 'master' 
Refactor css structure

Related to #3025 

cc @skyruler @DouweM @rspeicher @vsizov 

See merge request !1571
 2015-10-13 08:43:12 +00:00
Valery Sizov 0e34154d21 Project names are not fully shown if group name is too big, even on group page view 2015-10-13 11:37:57 +03:00
Stan Hu 7816488a89 Add "New Page" button to Wiki Pages tab 
Closes #2998
 2015-10-12 23:02:27 -07:00
Чингиз Ауанасов 42fb52adf4 Use css style 2015-10-13 04:41:51 +06:00
Kamil Trzcinski 4bf69b0bd9 Fix feature tests 2015-10-12 23:59:21 +02:00
Kamil Trzcinski 766da5fa7b Fix broken matrix_for_ref? 
Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
 2015-10-12 22:34:59 +02:00
Kamil Trzcinski daca1c6511 Fix broken tests 2015-10-12 22:32:29 +02:00
Dmitriy Zaporozhets 1af4fcfa12 Fix typos in application.scss 2015-10-12 19:00:21 +00:00
Stan Hu e12b6f30ef Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-12 08:13:22 -07:00
Kamil Trzcinski 5cd504ed33 Rename builds_without_retry to latest_builds 2015-10-12 16:39:08 +02:00
Kamil Trzcinski 2e9c1608e5 Fix commit skipping 2015-10-12 16:35:58 +02:00
Kamil Trzcinski 789fe7b489 Update rendering 2015-10-12 16:32:58 +02:00
Dmitriy Zaporozhets c8d01fa82a Merge branch 'reset_service_password' into 'master' 
Invalidate stored service password if the endpoint URL is changed



See merge request !1558
 2015-10-12 14:30:22 +00:00
Dmitriy Zaporozhets 4624e9e728 Merge branch 'spellcheck_false' into 'master' 
Add spellcheck=false to certain input fields

https://dev.gitlab.org/gitlab/gitlabhq/issues/2563

See merge request !1559
 2015-10-12 14:29:29 +00:00
Kamil Trzcinski 69c04498ef Small bug fixes 2015-10-12 15:55:12 +02:00
Douwe Maan 7a0cc665ff Remove useless assignment 2015-10-12 15:34:08 +02:00
Dmitriy Zaporozhets c42d35b721 Add css welcome notice 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-12 15:08:33 +02:00