home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +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
Han Loong Liauw 0bea5ced8b Made suggested content changes based on MR Review 
Changed the authentication method for removing fork through API
Reflected changes to new auth method in API specs
 2015-10-14 20:19:41 +11:00
Jacob VosmaerandGitLab 033a879cc9 Fix NGINX API download regex 
Users are allowed to supply namespace%2Fproject instead of a numeric ID
 2015-10-14 11:14:43 +02:00
Han Loong Liauw e1d70c4f31 Merge branch 'master' into add-dates-snippets-show 
Also removed fixes to btn-sm as they have appears to
be already merged into master
 2015-10-14 19:46:27 +11:00
Han Loong Liauw de026375fc Updated the style of the snippets header in #show 
It should now more closly match the styles used in
issues and merge requests with some small tweaks
to be more relevant to snippets
 2015-10-14 19:41:12 +11:00
Douwe Maan d313a7681b Explicitly only parse references by specified filter 2015-10-14 09:46:06 +02:00
Iman Mohamadi 7f7d39858f ugly outlines removed form sidebar 2015-10-14 11:14:59 +03:30
Douwe Maan 276b3a7bc2 Make Mentionable#cross_reference_exists? private. 2015-10-14 09:27:39 +02:00
Douwe Maan 613aa1cb87 Add defaults for incoming_email ssl and start_tls. 2015-10-14 07:21:15 +00:00
Douwe Maan d6fb96b927 Have Issue#participants load all users mentioned in notes using a single query 2015-10-14 09:17:05 +02:00
Robert Speicher 0fbb544c50 Update uglifier to ~> 2.7.2 2015-10-14 02:39:59 -04:00
Robert Speicher 530f0d71f5 Shut up, Rubocop 2015-10-14 01:07:58 -04: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
Douwe Maan cd2583a3be Code cleanup 2015-10-13 23:03:53 +02:00
Douwe Maan 93fcddd7a7 Allow ReferenceExtractor to efficiently load references from multiple texts at once 2015-10-13 22:53:05 +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 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
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
Douwe Maan 251e13666d Efficiently load multiple references of one type. 2015-10-13 18:23:49 +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
Douwe Maan 5dd77358f6 Pass project to RedactorFilter 2015-10-13 13:36:47 +02:00
Douwe Maan 712d17684b Make Reply by email easier to configure 2015-10-13 13:10:49 +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
Han Loong Liauw 520d85099f Merge branch 'master' into remove-forks-from-projects-settings 2015-10-13 21:55:56 +11:00
Han Loong Liauw df99ddbba1 Adds ability to remove the forked relationship 
This was previously possible through the API but can now be done
through the project#edit settings screen if the current user is
the owner of the project.
Update changelog
 2015-10-13 21:42:17 +11: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
Douwe Maan 127f288afb Use to_reference where possible. 2015-10-13 09:37:42 +00: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