Commit graph

2223 commits

Author SHA1 Message Date
Brad Rydzewski
19a7ae53e6 Merge pull request #1482 from macb/docker/resume_wait
resume waiting for the container to complete
2016-02-12 11:21:09 -08:00
Mac Browning
7a49d0324b use dockerclient.Wait to block for in-progress builds 2016-02-12 13:54:16 -05:00
Mac Browning
8df397db9f mark incomplete builds as errors 2016-02-12 13:23:11 -05:00
Mac Browning
110b9c3dd2 resume waiting for the container to complete 2016-02-12 13:23:11 -05:00
Brad Rydzewski
b382b6d4e5 Merge pull request #1453 from Bugagazavr/dot-names-gitlab-fix
Dot names fix
2016-02-05 16:10:28 -08:00
Brad Rydzewski
398db0bda2 add origin, content-type, accept to CORS conf 2016-02-05 13:39:11 -08:00
Brad Rydzewski
e018a34711 Added CORS to header to OPTIONS request 2016-02-05 13:04:46 -08:00
Brad Rydzewski
158295d02a Merge pull request #1467 from msteinert/public-mode
Add public mode
2016-02-05 12:43:38 -08:00
Michael Steinert
7c311cde42 Add public mode 2016-02-05 14:34:05 -06:00
Kirill Zaitsev
1f9516a385 Dot names fix 2016-02-02 01:28:09 +03:00
Brad Rydzewski
c064f37867 Merge pull request #1449 from Bugagazavr/avatars
Gitlab avatars
2016-01-31 23:25:34 -08:00
Kirilll Zaycev
fbf36458f1 Committer avatar 2016-02-01 02:49:52 +03:00
Kirilll Zaycev
193d524493 Ensure we add avatar when activate repo 2016-02-01 02:22:44 +03:00
Kirilll Zaycev
1dbefc5281 Added dummy image to repos list 2016-02-01 02:18:40 +03:00
Kirilll Zaycev
c4a608b38c Added gitlab repository avatars 2016-02-01 01:55:59 +03:00
Brad Rydzewski
8ffd8e51e5 initial prototype for metrics 2016-01-24 11:58:48 -08:00
Brad Rydzewski
171b986b70 fixing a lazy mistake w/ incorrect err type 2016-01-22 12:17:04 -08:00
Brad Rydzewski
31f1b8620c Merge remote-tracking branch 'upstream/master' 2016-01-22 12:02:09 -08:00
Brad Rydzewski
807040abb5 take OOMkill into consideration 2016-01-22 12:01:23 -08:00
Brad Rydzewski
46549f314b Merge pull request #1433 from michaelgibson/issue_1411
Enable skip_verify functionality in gogs client
2016-01-21 14:43:32 -08:00
Brad Rydzewski
20c1ca6e33 Update cache.go
set the cache to 30m instead of 24h until we have a way to flush from the UI
2016-01-21 13:23:19 -08:00
Michael Gibson
2de9f29c6b enabling skip_verify functionality in gogs client 2016-01-21 09:50:15 -07:00
Michael Gibson
5a4b928dbe updating go-gogs-client vendor codebase 2016-01-21 09:41:34 -07:00
Brad Rydzewski
cd6ad9d9dc Merge pull request #1306 from thomasf/master
Add /etc/nsswitch.conf to docker container
2016-01-20 12:05:30 -08:00
Brad Rydzewski
1937cea395 Merge pull request #1419 from Bugagazavr/gitlab-owner-fix
Add member struct to project
2016-01-13 15:56:44 -08:00
Kirilll Zaycev
32e2371ba6 Add member struct to project 2016-01-14 02:05:46 +03:00
Brad Rydzewski
4a85f4029c Merge pull request #1404 from gtaylor/patch-4
Spelling fix on controller/login.go [ci skip]
2016-01-13 12:44:11 -08:00
Brad Rydzewski
bff5834677 Merge pull request #1374 from Bugagazavr/embedded-gitlab-client
Move gitlab client inside drone
2016-01-13 12:43:39 -08:00
Brad Rydzewski
462a44d0cf Merge pull request #1413 from Duckbrain/master
Allow Gogs server on a subdirectory
2016-01-13 12:33:26 -08:00
Jonathan Duck
007a3462ca Allow Gogs server on a subdirectory 2016-01-13 04:31:16 -08:00
Brad Rydzewski
c60b7eddee Merge pull request #1382 from frapposelli/gh-status-fix
Make GitHub status API context congruous
2016-01-12 11:22:24 -08:00
Brad Rydzewski
8de3184009 Merge pull request #1401 from skygeo/master
fix: gitlab owner has admin privileges
2016-01-12 10:49:10 -08:00
Brad Rydzewski
ef8f236175 Merge pull request #1405 from objectpartners/escalate_filter
Add support for configuring escalated plugins via envvar.
2016-01-12 09:55:13 -08:00
John Engelman
d5767b7d57 Add support for configuring escalated plugins via envvar. 2016-01-12 11:42:17 -06:00
Georges Chaudy
39ee59a01b fix: gitlab owner permission 2016-01-12 15:40:13 +00:00
Brad Rydzewski
a84db63f11 Merge pull request #1407 from jackspirou/master
Allowing for protocol-relative access to external js and css in UI templates.
2016-01-11 10:57:17 -08:00
jackspirou
d78edefb0a allowing for protocol-relative access to external js and css in UI templates 2016-01-11 12:42:31 -06:00
Greg Taylor
8464511286 Spelling fix on controller/login.go 2016-01-09 23:00:24 -08:00
Georges Chaudy
bd616344fd fix: gitlab owner has admin privileges 2016-01-08 17:42:47 +00:00
Kirilll Zaycev
c69343ecc6 Remove println 2016-01-05 01:16:50 +03:00
Kirilll Zaycev
73dd59d1ca Remove unused data from structs 2016-01-05 01:07:36 +03:00
Brad Rydzewski
26f81835b6 Merge pull request #1393 from donatj/fix/CCMenuUrl
Corrects CC Menu url
2016-01-04 13:35:10 -08:00
Jesse Donat
64403c353e Corrects CC Menu url
CC Menu URL was an empty placeholder. This completes it with a URL
2016-01-04 15:26:30 -06:00
Brad Rydzewski
32cdf41ce7 Strip port from gogs netrc file 2015-12-24 10:09:18 -05:00
Brad Rydzewski
247aadf84b Merge pull request #1383 from nils-werner/ssh-key-alias
Append reponame to ssh keys
2015-12-22 11:30:03 -05:00
Nils Werner
2b3d6b45b6 Append reponame to ssh keys 2015-12-22 15:33:27 +01:00
Fabio Rapposelli
9eb4161750
Make GitHub status API context congruous
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-12-22 14:10:39 +01:00
Brad Rydzewski
7075cf02a3 Merge pull request #1381 from crhym3/no-skip-refs
Do not ignore refs/heads/gh-pages
2015-12-19 00:25:25 -05:00
alex
5ca67d304c Do not ignore refs/heads/gh-pages 2015-12-18 10:57:38 +00:00
Brad Rydzewski
e70c11f06a Merge remote-tracking branch 'upstream/master' 2015-12-15 23:20:20 -08:00