home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +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
Robert Speicher 817a60894a Merge branch 'get-ci-token-from-ci-projects' into 'master' 
Get CI token from ci projects

This fixes problem when GitLabCiService had different token than stored
in Ci::Project.

See merge request !1425
 2015-09-24 19:41:58 +00:00
Robert Schilling 83c9752e04 Merge pull request #9664 from fantasywind/patch-1 
Update 7.14-to-8.0.md
 2015-09-24 20:55:55 +02:00
Kamil Trzcinski 04c4445ae0 Test grace auth against gitlab_ci_project with token 2015-09-24 20:19:27 +02:00
Robert Speicher ce19e1739e Update stub syntax 2015-09-24 14:12:25 -04:00
Robert Speicher 1fef314df2 Merge branch 'update-mailroom' into 'master' 
Update mailroom to 0.5.2

Fixes #2698 and #2711.

See merge request !1424
 2015-09-24 18:09:31 +00:00
Robert Speicher e6655fe417 Merge branch 'newrelic-grape' into 'master' 
Add the newrelic-grape gem

This allows us to see a breakdown of API requests in New Relic.

See merge request !1419
 2015-09-24 17:52:23 +00:00
Ben Rosser 7d2655aae7 Remove 'kerberos' from auth_helper.rb for gitlab-CE. 
There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510
 2015-09-24 13:52:20 -04:00
Robert Speicher ede1ee851a Merge branch 'fix-default-avatar-in-network-graph' into 'master' 
Fix default avatar not showing up in network graph

The change in 71cdb24990 removed the `/assets` path in the default avatar to eliminate runtime errors, but this was one place where `image_path` was missed. If the user full URL is specified, `image_path` does nothing.

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

See merge request !1411
 2015-09-24 17:50:01 +00:00
Robert Speicher 3656c2fa53 Merge branch 'rs-troubleshooting' into 'master' 
Add Troubleshooting section to 8.0 docs

[ci skip]

See merge request !1416
 2015-09-24 17:03:12 +00:00
Robert Speicher 3c8b2cccca Merge branch 'reference-apache-templates-8.0' into 'master' 
Refer to Apache templates in 8.0 update guide

[ci skip]

See merge request !1426
 2015-09-24 17:01:15 +00:00
Robert Speicher 58c21dd77b Update Troubleshooting sections 2015-09-24 12:55:00 -04:00
Andrey 1f78c5d460 UI changes to the project view, empty project and project list new project button 2015-09-24 18:36:15 +02:00
Ben Boeckel eb912a534b api: add enable_ssl_verification to PUT/POST hooks 2015-09-24 12:34:16 -04:00
Ben Boeckel b07f48d52e doc: list note_events as a valid parameter for PUT/POST hooks 2015-09-24 12:33:58 -04:00
Ben Boeckel 22db4398c6 api: expose note_events and enable_ssl_verification for hooks 2015-09-24 12:33:11 -04:00
Kamil Trzcinski 5d69bc656a Fix grack auth spec 2015-09-24 17:47:57 +02:00
Jacob Vosmaer 040718e106 Refer to Apache templates in 8.0 update guide 2015-09-24 17:47:48 +02:00
Stan Hu 452621208c Fix default avatar not showing up in network graph 
Closes https://github.com/gitlabhq/gitlabhq/issues/9657
 2015-09-24 08:31:18 -07:00
Kamil Trzcinski 297f969bab Fix specs 2015-09-24 16:25:40 +02:00
Douwe Maan c4ca1ad4c3 Merge branch 'remove-ci-dashboard' into 'master' 
Remove CI dashboard

With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

See merge request !1422
 2015-09-24 13:53:06 +00:00
Pavel Forkert 0c877875ea Add entry to changelog 2015-09-24 16:42:29 +03:00
Pavel Forkert 3dec9dc4a3 Clarify spec title explanation 2015-09-24 16:40:21 +03:00
Pavel Forkert 82eeb5e284 Remove stuff from previous UI 2015-09-24 16:38:52 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Kamil Trzcinski 7545190c8a Remove unneeded change 2015-09-24 15:27:14 +02:00
Kamil Trzcinski 64295a18c5 Get GitLabCiService token from CI project 2015-09-24 15:27:13 +02:00
Douwe Maan f6be2e0d6c Update changelog 2015-09-24 15:15:29 +02:00
Douwe Maan 477017722b Add and document option to use StartTLS with mail_room. 2015-09-24 15:15:25 +02:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user 
Closes #2291
 2015-09-24 16:14:16 +03:00
Douwe Maan 29e0a43efe Update mail_room 2015-09-24 15:11:41 +02:00
Dmitriy Zaporozhets 2759b13ae9 Remove CI dashboard 
With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 15:10:25 +02:00
Dmitriy Zaporozhets 6a32608989 Merge branch 'ci-status-projects-page' into 'master' 
Show CI status on Your projects page and Starred projects page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

Screenshot: 

![Screenshot_2015-09-24_13.42.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0516ea02b72457a431bd72d3f6619dfe/Screenshot_2015-09-24_13.42.52.png)


See merge request !1420
 2015-09-24 13:09:31 +00:00
Julio bd6c982bf1 Documentation of omniauth-ldap limitations 
Further documentation about limitations directly impacting settings of
users' LDAP servers.
 2015-09-24 12:03:23 +00:00
Dmitriy Zaporozhets 353d426e4e Show CI status on Your projects page and Starred projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 14:00:23 +02:00
Dmitriy Zaporozhets 3e866b2aa6 Merge branch 'fix-markdown-preview-font' into 'master' 
Use standard Markdown font in Markdown preview instead of fixed-width font

Closes #2585

See merge request !1414
 2015-09-24 11:11:12 +00:00
Dmitriy Zaporozhets f2999fe8f3 Merge branch 'build-status-on-commit-page' into 'master' 
Build status on commit page

Screenshot:

![Screenshot_2015-09-24_11.29.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/49d1b9dc60d328dceaf771b5e44726ca/Screenshot_2015-09-24_11.29.54.png)

Part of #2594 

See merge request !1418
 2015-09-24 10:36:02 +00:00
Jacob Vosmaer 68f7bc63bc Add the newrelic-grape gem 
This allows us to see a breakdown of API requests in New Relic.
 2015-09-24 12:08:03 +02:00
Dmitriy Zaporozhets fd39414408 Merge branch 'remove-routes-helper' into 'master' 
Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

/cc @dzaporozhets @rspeicher 

See merge request !1391
 2015-09-24 09:53:04 +00:00
Dmitriy Zaporozhets 2be714dcf6 Show CI status on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 11:40:48 +02:00
Dmitriy Zaporozhets 9c4307e287 Show CI status on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 11:21:39 +02:00
Dmitriy Zaporozhets 5faf3e8176 Refactor ci-status badge css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 11:21:10 +02:00
Dmitriy Zaporozhets 081a0ddce7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-24 11:03:32 +02:00
Dmitriy Zaporozhets 24e8445af6 Merge branch 'move-ci-charts' into 'master' 
Move CI charts to project graphs area

Part of #2594 

Should be merged after !1405 


Same page but moved to another place 

![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png)


See merge request !1407
 2015-09-24 09:03:13 +00:00
Job van der Voort 827367ead7 Merge branch 'sshpage-fix' into 'master' 
Made some steps to add SSH keys more clear



See merge request !1936
 2015-09-24 08:48:46 +00:00
Douwe Maan ae3fba6cfa Merge branch 'rs-help-page' into 'master' 
Help page improvements

- Only signed-in users can see version information
- Add "Community Edition" text so the header is
  less barren when version information is hidden
- Minor copy edits
- Make all "Quick help" link text the entire body
  of the link. Prior, it wasn't obvious which part
  of each item was an actual link.

Closes #2721 

See merge request !1415
 2015-09-24 07:51:52 +00:00
Dmitriy Zaporozhets 50cff3e400 Check for CI enabled in correct place 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 09:47:52 +02:00
Dmitriy Zaporozhets 64e12d5853 Add header for ci graphs and check that it is enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 09:44:38 +02:00
Douwe Maan 4bf1e85cce Merge branch 'fix-network-graph-refs' into 'master' 
Remove git refs used internally by GitLab from network graph

GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph:

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


Closes #2702

See merge request !1410
 2015-09-24 07:43:53 +00:00
Dmitriy Zaporozhets ea58395525 Merge branch 'master' into move-ci-charts 2015-09-24 09:40:32 +02:00
Douwe Maan a58c6e9a95 Merge branch 'cleanup-ci-dashboard' into 'master' 
Cleanup ci dashboard

Part of #2594. Based on !1403

* remove rendering GitLab projects with not enabled CI on CI dashboard
* remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`)
* simplify the projects query for CI dashboard 

See merge request !1405
 2015-09-24 07:32:29 +00:00