home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,703 Commits 48 Branches 340 Tags
b46397548056e4e8ef00efe4f641c61ba1dd5230
Commit Graph
19703 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Lossent b463975480 Improve invalidation of stored service password if the endpoint URL is changed 
It now allows to specify a password at the same time as the new URL, and works
on the service template admin pages.
 2015-10-14 15:27:59 +02: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
Robert Speicher 82da19cecd Merge branch 'mailroom-arbitration' into 'master' 
Enable arbitration in MailRoom

Fixes #2870.

See merge request !1566
 2015-10-13 22:26:05 +00: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 ea2008df93 Merge pull request #9723 from sue445/tweak_api_doc 
Tweak api doc
 2015-10-13 10:17:23 -07: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
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
sue445 2297a7ba1f [ci skip] Add missing parameters in API doc 2015-10-14 00:45:11 +09:00
sue445 a092d27025 [ci skip] Fix wrong comment 
According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests`
is received `target_project_id` (NOT `target_project`)
 2015-10-14 00:36:54 +09: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 5313c38858 Merge branch 'css-cleanup' into 'master' 
Small css cleanup

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

cc @skyruler 

See merge request !1582
 2015-10-13 13:44:16 +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 c28d4c378b Merge branch 'ui-improvements' into 'master' 
Ui improvements

* fix dashboard projects page for mobile
* fix project home page for mobile
* remove gray padding for small screens
* render no-ssh message same like we do for flash messages

cc @skyruler 

See merge request !1581
 2015-10-13 12:39:13 +00: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
Dmitriy Zaporozhets b3aebbbdb3 Merge branch 'refactor-styles' into 'master' 
Refactor styles

cc @skyruler 

See merge request !1577
 2015-10-13 10:03:39 +00: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
Valery Sizov fb8f604f1c Merge branch 'update_changelog2' into 'master' 
Update changelog

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1559
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1558

See merge request !1576
 2015-10-13 08:16:39 +00:00
Valery Sizov cb9b53958a update changelog 2015-10-13 11:12:39 +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
Stan Hu e426c149d2 Merge pull request #9719 from teuneboon/master 
Small typo fix when deleting groups
 2015-10-12 08:09:24 -07:00
Kamil Trzcinski c61dc13150 Fix some changes 2015-10-12 16:41:36 +02: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
Hannes Rosenögger cde076c525 Merge branch 'fix-patch_guide' into 'master' 
don't set LATEST_TAG automatically in patch update guide

As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/2607, this removes the automatic setting of the LATEST_TAG variable in the update guide, because it could get set to rc versions.

Instead, a command was added to list all tags, with the most recent one being on the end of the list. Also a note was added to prevent users from updating to new minor/major versions because the tag list includes all tags.

[ci skip]

See merge request !1510
 2015-10-12 13:20:07 +00: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
Dmitriy Zaporozhets bdd477a0f8 Re-organize GitLab css into 2 directories: framework and page specific css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-12 15:00:04 +02:00
Dmitriy Zaporozhets cba6d62323 Move CI styles to pages dir 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-12 14:49:23 +02:00