home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,979 Commits 48 Branches 340 Tags
600d6eeff326fe42e4074b4bb963fc10e401c6f5
Commit Graph
18979 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 600d6eeff3 Fix CI status in the MR page 2015-09-18 18:02:29 +03: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 d272682a15 Merge branch 'fix-ci-non-public-project' into 'master' 
Fix 500 when accessing private project when not logged in



See merge request !1336
 2015-09-18 09:18:49 +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
Dmitriy Zaporozhets e9a5680998 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-18 10:55:13 +02: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
Kamil Trzcinski b53994bb9e Remove Cancel button in Project settings 2015-09-17 23:33:21 +02:00
Kamil Trzcinski d4be967478 Fix 500 when accessing private project when not logged in 2015-09-17 23:27:08 +02:00
Job van der Voort 1c303bc0eb Merge branch 'global-key' into 'master' 
Note about global keys

Because of tweet https://twitter.com/ChoboIslah/status/639565184806309888

See merge request !1931
 2015-09-17 17:19:42 +00:00
Valery Sizov b7e49d8042 Fix: ci projects order 2015-09-17 20:12:17 +03:00
karen Carias ca95842f94 fixed text 2015-09-17 09:40:46 -07: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
Dmitriy Zaporozhets 0e1948fbed Merge branch 'refactor-blob-upload-locals' into 'master' 
Move partial locals out of controller

Some minor cleanup for upload/replace functionality: move controller variables into partial locals.

See merge request !1331
 2015-09-17 15:48:22 +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
Dmitriy Zaporozhets 3c2a6174f9 Merge branch 'ci-nav-changes' into 'master' 
Integrate CI navigation more tightly with project

![Screen_Shot_2015-09-17_at_09.51.56](https://gitlab.com/gitlab-org/gitlab-ce/uploads/013807ad9f89a35a4af988199c2ee92f/Screen_Shot_2015-09-17_at_09.51.56.png)
![Screen_Shot_2015-09-17_at_09.52.14](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8f9bdaafeef62fa451ee3699f003cbc4/Screen_Shot_2015-09-17_at_09.52.14.png)
![Screen_Shot_2015-09-17_at_09.52.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cb726bf0651ddb74c10fd7bae9a333fb/Screen_Shot_2015-09-17_at_09.52.07.png)

/cc @dzaporozhets

See merge request !1324
 2015-09-17 13:16:28 +00: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
Kamil Trzciński 591f2e1df2 Merge branch 'fix-schema-downgrade' into 'master' 
Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299

Fixes: https://dev.gitlab.org/ci/projects/1/refs/master/commits/2e9a7032cec02588484eb162717298d311770c7d
Introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299

See merge request !1326
 2015-09-17 11:49:51 +00:00
Kamil Trzciński 9398370636 Merge branch 'ci-whenever-clear' into 'master' 
Remove CI cronjob during migration

See merge request !1329
 2015-09-17 10:42:30 +00:00
Jacob Vosmaer 1ab80247bc Remove CI cronjob during migration 2015-09-17 12:23:35 +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
Kamil Trzcinski eb1444ee11 Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299 2015-09-17 10:31:08 +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
Dmitriy Zaporozhets da3d35952d Merge branch 'restrict-user-api-integers' into 'master' 
Restrict users API endpoints to use integer IDs

Closes #2267

See merge request !1156
 2015-09-17 07:29:57 +00:00
Dmitriy Zaporozhets efa90d0a14 Merge branch 'fix-gh-issue-9640' into 'master' 
Fix HTML link that was improperly escaped in new user e-mail

### Before:

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

### After:

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

Closes https://github.com/gitlabhq/gitlabhq/issues/9640

See merge request !1323
 2015-09-17 07:27:41 +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
Robert Speicher 480e713c8f Merge branch 'update-mailroom' into 'master' 
See merge request !1306
 2015-09-16 22:19:35 -04: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 Trzciński cac969229a Merge branch 'fix-nginx' into 'master' 
Add missing proxy requests to migration docs

See merge request !1317
 2015-09-16 20:02:49 +00:00
Kamil Trzcinski 04a164c2dc Fix 500 on CI project settings 2015-09-16 21:59:10 +02:00
Robert Speicher b39b156407 Merge branch 'rs-install-guide' into 'master' 
Change 7-14-stable to 8-0-stable in doc/install/installation.md

Also fixes sudo user from previous MR.

[ci skip]

See merge request !1320
 2015-09-16 19:36:25 +00:00
Robert Speicher 897e3a20b3 sudo user is git, not gitlab, not gitlab_ci 
[ci skip]
 2015-09-16 15:34:53 -04:00
Robert Speicher e46f5e60b6 Change 7-14-stable to 8-0-stable in doc/install/installation.md 
[ci skip]
 2015-09-16 15:32:55 -04:00
Robert Speicher 2f23744979 Merge branch 'rs-fix-update-guide' into 'master' 
Fix 7.14 to 8.0 update guide

[ci skip]

See merge request !1319
 2015-09-16 19:29:24 +00:00