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
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Patricio Cano 23f9a64566 Use the find_by_user_id magic finder instead of where. 2015-09-16 21:02:40 -05:00
Patricio Cano 825db23f67 Updated label from Mention to On Mention. 2015-09-16 20:04:12 -05:00
Patricio Cano 1ddefa3bea Merge branch 'master' into notification-levels 2015-09-16 19:54:18 -05:00
Patricio Cano 1ef2ce95d5 Merge branch 'master' into notification-levels 2015-09-16 19:52:57 -05:00
Patricio Cano 4c98357f16 Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications 2015-09-16 19:46:24 -05:00
Patricio Cano de1ffce739 Added Spinach tests and updated CHANGELOG 2015-09-16 18:03:48 -05: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
Kamil Trzcinski e01300ddb0 Fix update_runner_info helper 2015-09-16 16:46:26 +02:00
Kamil Trzcinski 7348d34cfd Fix migrate tags statement 2015-09-16 16:46:19 +02:00
Kamil Trzcinski 5772faf19b Fix projects edit 2015-09-16 16:46:10 +02:00
Robert Schilling 421d055371 Merge branch 'markdown_help_fix' into 'master' 
Fix in Markdown help page: properly create the link to a wiki page.

The help file on Markdown that is included with Gitlab CE (7.14.3 d321305)
and also gitlab.com (see https://gitlab.com/help/markdown/markdown#links)
contains a typo in the description of a link to a wiki page.

See merge request !1310
 2015-09-16 14:27:16 +00:00
Nicolas Bigaouette 5a035238cb Fix in Markdown help page: properly create the link to a wiki page. 
The help file on Markdown that is included with Gitlab CE (7.14.3 d321305)
and also gitlab.com (see https://gitlab.com/help/markdown/markdown#links)
contains a typo in the description of a link to a wiki page.
 2015-09-16 10:00:27 -04:00
Dmitriy Zaporozhets 0696aeb3dc Fix gemfile.lock 2015-09-16 15:19:47 +02:00
Douwe Maan 4b95b0ebec Fix Gemfile.lock 2015-09-16 14:43:27 +02:00
Douwe Maan 624a2cf27c Merge branch 'master' into update-mailroom 2015-09-16 14:42:49 +02:00
Kamil Trzciński cccd269da3 Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master' 
Merge CI into CE

First step of #2164.

- [x] Merge latest CE master
- [x] Make application start
- [x] Re-use gitlab sessions (remove CI oauth part)
- [x] Get rid of gitlab_ci.yml config
- [x] Make tests start
- [x] Make most CI features works
- [x] Make tests green
- [x] Write migration documentation
- [x] Add CI builds to CE backup

See merge request !1204
 2015-09-16 11:57:40 +00: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
Kamil Trzcinski 0859ba75a8 Fix migrate task 2015-09-16 13:30:34 +02:00
Valery Sizov ee5ce705d4 fix rubocop 2015-09-16 13:20:38 +03:00
Kamil Trzcinski fb0bd4eb2f Added info about gitlab.yml config 2015-09-16 11:08:48 +02:00