home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 21:46:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,963 Commits 48 Branches 340 Tags
fc8ae32bcefdeb3fb629d932ba1ac5cc2f31f38d
Commit Graph
9299 Commits
Author SHA1 Message Date
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
Stan Hu b75e4d7149 Merge pull request #9618 from pjknkda/repo-info-to-issue-hook 
add repository field to issue hook data
 2015-09-17 07:03:47 -07:00
Kamil Trzcinski e960b3ad2c Fix nav_link for dashboard 2015-09-17 14:23:46 +02:00
Kamil Trzcinski d059d34622 Remove duplicate code 2015-09-17 14:22:56 +02:00
Kamil Trzcinski e7bca1c853 Check current_controller against controller_path 
The controller_path includes namespaces, where controller_name only includes the class name without controller
 2015-09-17 14:22:43 +02:00
Kamil Trzcinski da6d9607d1 Integrate CI navigation more tightly with project 2015-09-17 13:56:21 +02:00
Stan Hu f481637245 Merge branch 'fix-issue-2382' into 'master' 
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity

Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".

Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:

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

Closes #2382

See merge request !1227
 2015-09-17 08:04:37 +00:00
Valery Sizov 2e9a7032ce Merge branch 'enable_ssl_by_default' into 'master' 
Enable SSL by default

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1135

See merge request !1299
 2015-09-17 07:46:01 +00:00
Dmitriy Zaporozhets 6cbc20512c Merge branch 'fix-ci-500-on-settings' into 'master' 
Fix 500 on CI project settings

Fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/2546

/cc @dzaporozhets

See merge request !1321
 2015-09-17 07:35:20 +00:00
Dmitriy Zaporozhets 32fc0a259c Merge branch 'fix-public-projects' into 'master' 
Fix displaying public projects

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

See merge request !1318
 2015-09-17 07:33:26 +00:00
Valery SizovandValery Sizov ce4defaf2f enable SSL by default 2015-09-17 09:51:24 +03:00
Stan Hu b71a9fcdeb Fix HTML link that was improperly escaped in new user e-mail 
Closes https://github.com/gitlabhq/gitlabhq/issues/9640
 2015-09-16 21:24:53 -07:00
Jungkook Park e4ac2d582c add repository field to issue hook data 
add a test for to_hook_data of issue model

update CHANGELOG
 2015-09-17 05:33:37 +09:00
Kamil Trzcinski 04a164c2dc Fix 500 on CI project settings 2015-09-16 21:59:10 +02:00
Kamil Trzcinski 4ae13f5f42 Fix displaying public projects 2015-09-16 21:01:44 +02:00
Dmitriy Zaporozhets d906dedec6 Merge branch 'fix-ci-nav' into 'master' 
Fix confusing behaviour of back link in CI sidebar

Back link should always be responsible for sidebar navigation below.
It should change sidebar navigation to one level up

See merge request !1316
 2015-09-16 19:00:02 +00:00
Dmitriy Zaporozhets 6cf554bd3c Merge branch 'style-ci-page' into 'master' 
Style CI projects page and builds list

Partly implements #2545

See merge request !1315
 2015-09-16 18:57:35 +00:00
Dmitriy Zaporozhets f7365ae33e Merge branch 'fix-issue-2555' into 'master' 
Fix default avatars to ensure that helpers don't have /assets dir appended

See issue #2555

See merge request !1314
 2015-09-16 18:40:18 +00:00
Dmitriy Zaporozhets 9437f0618a Fix confusing behaviour of back link in CI sidebar 
Back link should always be responsible for sidebar navigation below.
It should change sidebar navigation to one level up
 2015-09-16 20:16:44 +02:00
Stan Hu 1dc04bf6b7 Eliminate combined image_tag and image_path in providers list 2015-09-16 11:04:09 -07:00
Dmitriy Zaporozhets 07d20657ce Style CI projects page and builds list 2015-09-16 19:59:21 +02:00
Stan Hu 71cdb24990 Fix default avatars to ensure that helpers don't have /assets dir appended 2015-09-16 10:52:23 -07:00
Dmitriy Zaporozhets a0aa6453bd Merge branch 'add-links-to-ci' into 'master' 
Add links from GitLab to CI

* link from dashboard to CI dashboard
* link from project to CI project

Its a fast solution for 8.0. Might be improved in later versions

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

See merge request !1313
 2015-09-16 16:26:41 +00:00
Dmitriy Zaporozhets f9dc3a2fb5 Add links from GitLab to CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-16 17:54:38 +02:00
Kamil Trzcinski 7ea48ec546 Fix CI tests 2015-09-16 17:20:00 +02:00
Kamil Trzcinski 912f470497 Fix ordering issue 2015-09-16 16:59:54 +02:00
Kamil Trzcinski 5772faf19b Fix projects edit 2015-09-16 16:46:10 +02:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Stan Hu c61b6eeb2f Merge pull request #9634 from allistera/users-autocomplete-sort-order 
Sorted autocomplete users list by name
 2015-09-15 16:41:15 -07:00
Allister Antosik c9389d0e74 Sorted autocomplete users list by name 2015-09-15 22:48:24 +01:00
Kamil Trzcinski fb9cb3f06c Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-15 23:20:00 +02:00
Stan Hu 61737af503 Merge branch 'fix-upload-ui' into 'master' 
Cleanup some html/css for upload feature

* fix colors to match UI style
* cleanup templates from meaningless code
* improve placeholders
* remove code duplication in template
* improve error handling: remove file automatically

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

For #2520

See merge request !1297
 2015-09-15 20:56:11 +00:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
# Conflicts:
#	Gemfile.lock
 2015-09-15 22:40:35 +02:00
Drew Blessing 0ad669bb5b Merge branch 'slack-help-text' into 'master' 
Add a help text to the Slack Service

When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook

See merge request !1302
 2015-09-15 20:36:32 +00:00
Kamil Trzcinski fe42de3a48 Fix: features/ci/admin/runners_spec.rb 2015-09-15 22:15:28 +02:00
Stan Hu d9af6f79ed Change the replace placeholder to use the filename 
Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file
 2015-09-15 13:07:32 -07:00
Robert SchillingandStan Hu 0a8ef29b3d Improve wording for header and placeholders 2015-09-15 13:07:32 -07:00
Dmitriy ZaporozhetsandStan Hu e14aa19e39 Cleanup some html/css for upload feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 13:07:32 -07:00
Jared Szechy 93bb8f14ef Use fixed version of fogbugz gem 
This allows us to properly handle authentication errors.
 2015-09-15 15:23:30 -04:00
Kamil Trzcinski 5285e01d54 Fix: features/ci/runners_spec.rb 2015-09-15 21:21:46 +02:00
Jeroen van Baarsen 34e1ce130f Add a help text to the Slack Service 
When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-15 20:46:11 +02:00
Dmitriy Zaporozhets d9d50c0598 Merge branch 'fix_empty_project' into 'master' 
Fix empty project UI

In an empty project, the 'project is empty' light well was mashed up against the project panel. The light well have 16px margin so there was some white space along the edges that looked funny. This MR makes the 'project is empty' text block a `gray-content-area` which fits nicely with the rest of the UI.

**Current:**

![Screen_Shot_2015-09-14_at_11.20.47_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/07b39641f602e01440dd5558a0d80237/Screen_Shot_2015-09-14_at_11.20.47_AM.png)

**As proposed:**

![Screen_Shot_2015-09-14_at_11.20.29_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/1c3b1d73584c68a88cd1b0fcf3d6ea5b/Screen_Shot_2015-09-14_at_11.20.29_AM.png)

See merge request !1291
 2015-09-15 16:07:22 +00:00
Dmitriy Zaporozhets dad9de660c Merge branch 'import-in-progress-fix' into 'master' 
Don't display "git clone --bare <URL>" if no URL is available

Make it clear that forking is different than importing. Forked repositories don't use `import_url`, so only display if is available. Introduced in !1231

Before:

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

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9823e8a2baf02859c4c3f05f3a5c35bf/image.png)

See merge request !1295
 2015-09-15 16:04:20 +00:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Stan Hu 2abe733866 Display "Forking in Progress" when importing a forked project 2015-09-15 06:45:03 -07:00
Stan Hu 4d2b67acc0 Don't display "git clone --bare <URL>" if no URL is available 
Introduced in !1231
 2015-09-15 06:39:37 -07:00
Stan Hu d3d03d1362 Create a "destroyed Milestone" event and keep Milestone events around in the DB 
for posterity.

Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".

Add "in" preposition when creating and destroying milestones

Closes #2382
 2015-09-15 05:51:11 -07:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00