home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,925 Commits 48 Branches 340 Tags
b39b156407f5ef1ea483dcd8d628d4835d02b2ff
Commit Graph
18925 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Kamil Trzcinski d3886f9d41 Added migration docs and updated installation documentation 2015-09-16 10:58:33 +02:00
Dmitriy Zaporozhets 7d59ba00b9 Merge branch 'fix-api-mr-sort' into 'master' 
Fix broken sort in merge request API

This MR fixes a bug in the API in querying for merge requests with a `sort_by` field would never change the ordering of the results.

Closes #2266

See merge request !1305
 2015-09-16 07:29:29 +00:00
Douwe Maan 84d57bc703 Make code clearer 2015-09-16 09:14:04 +02:00
Douwe Maan 63b0437323 Merge branch 'reply-by-email-docs' into 'master' 
Expand Reply by email documentation

TODO:

- [x] Verify this works on dev server
- [ ] Figure out SSL somehow: http://www.postfix.org/TLS_README.html (Moved to #2453)

See merge request !1193
 2015-09-16 07:09:56 +00:00
Douwe Maan b92c03730b Tweak text 2015-09-16 09:09:09 +02:00
Stan Hu 1c289ac0c3 Fix broken sort in merge request API 
Closes #2266
 2015-09-15 22:55:22 -07: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
Stan Hu db6658299e Merge pull request #9633 from szechyjs/update-fogbugz-gem 
bump fogbugz gem
 2015-09-15 16:40:32 -07:00
Kamil Trzcinski df7d807d5a Migrate CI services 2015-09-16 00:43:04 +02:00
Kamil Trzcinski 1b464bfe03 Update documentation and config files 2015-09-16 00:28:59 +02:00
Kamil Trzcinski f2d8902341 Start working on migration docs 2015-09-16 00:09:09 +02:00
Kamil Trzcinski 9c5833d5ac Add rake task for easy migration of SQL dumps 2015-09-16 00:09:09 +02:00
Kamil Trzcinski 2f2b9f67c2 Fix backup tests 2015-09-16 00:06:41 +02:00
Allister Antosik c9389d0e74 Sorted autocomplete users list by name 2015-09-15 22:48:24 +01:00
Kamil Trzcinski 416d98b497 Fix: models/ci/project_spec.rb once again 2015-09-15 23:42:57 +02: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
Kamil Trzcinski 2d8c4273ef Fix models/ci/mail_service_spec.rb 
- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
 2015-09-15 23:18:52 +02:00
Kamil Trzcinski 757fdd34dc Revert "Fix: models/ci/mail_service_spec.rb" 
This reverts commit 345ff6cbf9.

This requires sidekiq >= 3.4 and fixed all other CE tests
 2015-09-15 23:09:04 +02:00