home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,212 Commits 48 Branches 340 Tags
320e0b7fa77d145e669af89640cf349dfdd9986c
Commit Graph
3432 Commits
Author SHA1 Message Date
Achilleas PipinellisandYorick Peterse 0eadb29d8e Merge branch 'add-tags-to-fetch' into 'master' 
Add --tags to fetching gitlab-shell to ensure tags are downloaded

Closes #15525

See merge request !3896
 2016-04-25 19:50:27 +00:00
Achilleas PipinellisandYorick Peterse 6c68a030c9 Merge branch 'doc/gitlab-shell-tag' into 'master' 
Bump gitlab-shell to 2.7.2

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15525

See merge request !3884
 2016-04-25 19:49:21 +00:00
Achilleas PipinellisandYorick Peterse c291e9b553 Merge branch 'doc-gh-import-additions' into 'master' 
Add newest enhancements to GH importer docs

[ci skip]

See merge request !3867
 2016-04-22 10:57:04 +02:00
Achilleas PipinellisandYorick Peterse c465c90068 Merge branch 'doc_note_cherry_pick' into 'master' 
Use new Note styleguide



See merge request !3866
 2016-04-22 10:56:49 +02:00
Achilleas PipinellisandYorick Peterse 0a9ce658ac Merge branch 'doc-updating-gitlab' into 'master' 
Refactor the update documentation



See merge request !3822
 2016-04-21 22:31:27 +00:00
Yorick Peterse 08e24b340e Merge branch 'repository-checks-default-off' into 'master' 
Disable 'repository check' feature in 8.7.0

See merge request !3856
 2016-04-21 22:27:02 +00:00
Rémy CoutableandYorick Peterse 223c64f8b5 Merge branch 'feature/incremental-build-trace-update' into 'master' 
Add incremental build trace update API

Closes #14537 

Must be merged if we want changes from gitlab-org/gitlab-ci-multi-runner!124 to work.

See merge request !3447
 2016-04-21 09:23:43 +00:00
Robert SpeicherandYorick Peterse 69821f1a01 Merge branch 'license-templates-and-api-12804' into 'master' 
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 2016-04-20 10:50:27 +02:00
P.S.V.RandYorick Peterse fd4c833367 Add support to cherry-pick any commit 
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
 2016-04-19 19:19:00 +02:00
Hannes Rosenögger 9bab098455 Merge branch 'patch-1' into 'master' 
"git lfs init" is deprecated, use "git lfs install" instead.

Recent releases of git-lfs warn that "init" is a deprecated command and that "install" should be used.


See merge request !3779
 2016-04-19 15:35:33 +00:00
Grzegorz Bizon fd13cd189f Merge branch 'docs/notice-about-gitlab-runner' into 'master' 
Add notice about GitLab Runner to requirements docs

This is related to #14589, and problems that may stem from running
GitLab Runner on same machine user installed GitLab web app on.

See merge request !3518
 2016-04-19 12:17:48 +00:00
Kamil Trzciński c7bd7b6dd8 Merge branch 'make-before-after-overridable' into 'master' 
Make before_script and after_script overridable

This is makes it possible to overwrite the before_script and after_script at job level.

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3771


See merge request !3772
 2016-04-19 11:12:40 +00:00
Kamil Trzciński 479f4cccf1 Merge branch 'after-script' into 'master' 
Implement after_script which allows to do cleanups as part of the build process

This implements `after_script` in global context.

The `after_script` will be executed always after the job, even if the job were canceled.

This requires changes on Runner side that will be implemented in 1.2.

cc @tmaczukin @grzesiek 


See merge request !3771
 2016-04-19 11:11:31 +00:00
Gabriel MazettoandDmitriy Zaporozhets 5330af3fa6 Using single builder for push and tag events 2016-04-19 11:00:30 +02:00
Gabriel MazettoandDmitriy Zaporozhets ee1090e2b2 Added System Hooks for push and tag_push 
Code is based on Project Webhooks, removing deprecations and without
commits listing.
 2016-04-19 11:00:30 +02:00
Felipe Artur 820c08cefd Fix documentation and improve permissions code 2016-04-18 11:12:28 -03:00
Felipe Artur 7d54e721da Insert instructions in admin page and permissions document 2016-04-18 11:12:28 -03:00
Kamil Trzcinski 2ab8d3e652 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 09:47:12 -04:00
Kamil Trzcinski aca1e14bd3 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:46:12 -04:00
Kamil Trzcinski 39c2677e86 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:43:45 -04:00
Kamil Trzcinski 42102b4344 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 07:53:21 -04:00
Grzegorz Bizon 2972a991df Add minor fixes in docs for job-specific variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a2957291b3 Update documentation on job level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a264973905 Improve grammar in CI documentation for build vars 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 5d89bdb16a Add documentation for job-level build variables 2016-04-18 13:17:48 +02:00
Con Vissenberg fce97dfce7 "git lfs init" is deprecated, use "git lfs install" instead. 2016-04-18 08:15:15 +00:00
Kamil Trzcinski c764b57f09 Add note about version 2016-04-17 09:11:37 -04:00
Kamil Trzcinski 38b15e35d4 Update CHANGELOG and add documentation 2016-04-17 09:10:47 -04:00
Kamil Trzcinski a0afeefd76 Add CHANGELOG and documentation 2016-04-17 09:02:42 -04:00
Robert Schilling 178dfb1917 Merge branch 'typos_in_ci_doc' into 'master' 
Fix typos in CI docs.



See merge request !3709
 2016-04-16 10:44:14 +00:00
Jacob Vosmaer c795ef079c Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2016-04-15 10:42:32 +02:00
lurdan d2f490c8f3 fix required gitlab-shell version. 
Under the procedure, I've warned about gitlab-shell version, which should be 2.6.12 (may be some minor revisions introduces that).
 2016-04-15 12:41:26 +09:00
Robert Speicher 0554664e56 Merge branch 'patch-1' into 'master' 
change "very demand" to "specific demand" in CI runner docs

[ci skip]

See merge request !3726
 2016-04-14 21:39:57 +00:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master' 
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
 2016-04-14 17:15:58 +00:00
Jamie Neubert Pedersen b49069b72c change: "very demand" changed to "specific demand" 
This must be an error as the sentence doesn't make sense otherwise
 2016-04-14 16:04:18 +00:00
Robert Speicher 39f6cfcc3e Merge branch 'rake-db-reset' into 'master' 
Use rake db:reset instead of db:setup

See merge request !3721
 2016-04-14 15:07:58 +00:00
Jacob Vosmaer 91cebb7289 Documentation / help improvements 2016-04-14 17:04:18 +02:00
Yorick Peterse a54af831ba Use rake db:reset instead of db:setup 
Using db:reset ensures existing tables are first dropped. This in turn
ensures that we can drop tables regardless of any foreign key
constraints. While CE currently doesn't have any foreign keys EE defines
the following relation:

    remote_mirrors.project_id -> projects.id

MySQL will complain whenever you try to drop the "projects" table first
even when using "DROP TABLE ... CASCADE".
 2016-04-14 15:53:54 +02:00
Rémy Coutable 64776ab2b4 Merge branch 'start-with-iid-on-new-branch' into 'master' 
Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708
 2016-04-14 13:41:30 +00:00
Achilleas Pipinellis e1acd361af Merge branch 'master' into 'master' 
Update shibboleth configuration for GitLab 8.6 and Apache 2.4



See merge request !3713
 2016-04-14 13:22:27 +00:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Achilleas Pipinellis 072b9c2c8f Add TOC to yaml README and an intro section 
[ci skip]
 2016-04-14 15:40:05 +03:00
Tom Downes 8978921323 Update shibboleth configuration for GitLab 8.6 and Apache 2.4 2016-04-14 01:03:50 +00:00
Hyunwoo Jung f2aacc25fb Fix typos in CI docs. 2016-04-13 21:19:50 +00:00
Michael Greene c1467f5d97 Allow back dating notes on creation 2016-04-13 12:04:09 -05:00
Michael Greene 28a7fe25fd Allow back dating issues on update 2016-04-13 12:04:09 -05:00
Achilleas Pipinellis 59bfc0fb59 Merge branch 'update-influx-documentation' into 'master' 
Updated InfluxDB/Grafana setup/import docs

See https://gitlab.com/gitlab-org/grafana-dashboards/merge_requests/1 for some background info.

cc @dblessing 

See merge request !3706
 2016-04-13 16:23:50 +00:00
Rémy Coutable c8560894f7 Merge branch 'api-subscribe-issue-mr' into 'master' 
API: Subscribe and unsubscribe from issues and merge requests

* Closes #6024 

This MR is based on !3611, which must be merged first.


See merge request !3615
 2016-04-13 15:54:31 +00:00
Jacob Vosmaer f07316f27c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-13 17:38:59 +02:00
Yorick Peterse 0a37976a4d Updated InfluxDB/Grafana setup/import docs 
The grafana-dashboards repository now contains _all_ GitLab.com
dashboards and thus requires some extra continuous queries to be set up.
The repository now also provided a way to automatically import/export
dashboards.

[ci skip]
 2016-04-13 17:29:04 +02:00