home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,959 Commits 48 Branches 340 Tags
8d0219f0da6419fe8a2e71f3e7ccf31437b5cb6b
Commit Graph
18959 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Robert Speicher 1ff7833e8c sudo user is gitlab, not gitlab_ci 2015-09-16 15:26:15 -04:00
Robert Speicher 19a63b0ddf Add missing code fence closure 2015-09-16 15:24:51 -04: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
Kamil Trzcinski 50e5950947 Add missing proxy requests to migration docs 2015-09-16 20:45:58 +02: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
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master' 
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
 2015-09-16 18:34:55 +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 f4920b769f Merge branch 'fix-gitlab-ci-in-ce' into 'master' 
Fix first bunch of regressions in GitLab CI

/cc @vsizov @dzaporozhets

See merge request !1312
 2015-09-16 15:58:28 +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 2b20603f5a Make rubocop happy 2015-09-16 17:30:15 +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 1b2a1d0ddd Fix skipped svg 2015-09-16 16:48:54 +02:00