home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +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
Douwe Maan 87db46e2d8 Fix typo in Reply by email docs 2015-09-18 12:11:49 +00:00
Kamil Trzcinski 97fa990406 Use 400 to notify that CI API is disabled 2015-09-18 12:46:47 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02: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
Jeroen van Baarsen 8d0219f0da Make Visit project on GitLab button goes to The internal Gitlab project 
Since we are merging CI into CE, projects should go to the internal Projects
page, we can also use Turbolinks to do so.

In order to give the user an idea of integration, I renamed the button: "Go to
Project"

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-18 11:08:37 +02: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
Ben Hadley-Evans 0f41417a8c Correct markdown.md docs RE use in commit messages. 
Remove the line from the markdown documentation which states GFM can be used in commit messages as this is currently not true. See issue gitlab-org/gitlab-ce#1582.

[ci skip]
 2015-09-18 09:35:40 +01: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
Dmitriy Zaporozhets e86668984f Style CI project/build list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 09:44:10 +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
Robert Speicher 62c0e5ab6a Redcarpet didn't like unordered lists deeply nested in an ordered one 
I don't really like making these an ordered list since they're mutually
exclusive, but I think the structure is what's important.

[ci skip]
 2015-09-17 16:38:31 -04:00
Robert Speicher eae049505c Fix link to "create a database dump" header 2015-09-17 16:35:59 -04:00
Robert Speicher 8cc788be4e Indent database dump steps one more level 
[ci skip]
 2015-09-17 16:29:06 -04:00
Robert Speicher 567eac0396 Reformat and copy edit the CI-to-CE migration guide 2015-09-17 16:24:00 -04: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
Marin Jankovski 4e33b47a50 Update the link in integration readme. 2015-09-17 17:08: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
Marin Jankovski 1247076b45 Remove double png. 2015-09-17 13:19:38 +02: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
Marin Jankovski 8379a1c754 Add Gmail actions button for GitLab doc. 2015-09-17 12:14:28 +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