home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,029 Commits 48 Branches 340 Tags
3f574c4db958f2d1ea4d6475cb027dc005fbae87
Commit Graph
3406 Commits
Author SHA1 Message Date
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
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
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
Robert Schilling a9200d93d3 Ensure that issues and merge requests are found 2016-04-13 17:15:42 +02:00
Rémy Coutable 94e130cec3 Merge branch 'api-star-project' into 'master' 
API: Star and unstar a project

Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project.

* Closes #12739


See merge request !3578
 2016-04-13 15:05:21 +00:00
Achilleas Pipinellis dabedd1d8c Merge branch 'fix_grafana_docs' into 'master' 
Fix Grafana docs and link from Influx page

Fixing images and adding links to Influx docs, as suggested by @sytses 

See merge request !3702
 2016-04-13 14:26:35 +00:00
Robert Schilling 54231aa4e0 Styling changes to code and docs 2016-04-13 16:25:24 +02:00
Marin Jankovski c746046992 Merge branch 'external-omniauth-providers' into 'master' 
Allow Omniauth providers to be marked as external

Related to #4009 

With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login.

MR for Omnibus: gitlab-org/omnibus-gitlab!727

/cc @dblessing @DouweM 

See merge request !3657
 2016-04-13 13:09:47 +00:00
Dmitriy Zaporozhets 87cd46c475 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-13 14:47:17 +02:00
Robert Schilling 3ab9ea8dae Make staring API more restful 2016-04-13 14:26:41 +02:00
Robert Schilling ea2193aaeb API: Star and unstar a project 2016-04-13 14:26:40 +02:00
Robert Schilling fa3009095f Make subscription API more RESTful 2016-04-13 13:52:13 +02:00
Robert Schilling f875189b39 API: Ability to subscribe and unsubscribe from a merge request 2016-04-13 13:45:01 +02:00
Robert Schilling bd0be13f5b API: Ability to subscribe and unsubscribe from an issue 2016-04-13 13:45:00 +02:00
Rémy Coutable 861e685e18 Merge branch 'api-move-issues' into 'master' 
API: Ability to move an issue

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

See merge request !3593
 2016-04-13 10:55:12 +00:00
Robert Schilling 94c8fbc9fc Merge branch 'patch-2' into 'master' 
improve formatting



See merge request !3688
 2016-04-13 10:25:58 +00:00
Jacob Vosmaer 9a30d3b5ae Remove \f. WT\F ?? 2016-04-13 12:20:43 +02:00
Robert Schilling fdbf368202 Fix doc for moving an issue 2016-04-13 12:03:05 +02:00
Rémy Coutable e83424a13e Merge branch 'configure_trusted_proxies' into 'master' 
Adjust the default trusted_proxies to only include localhost

And also allow other trusted proxies to be added from the config.yml.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538

Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208

See merge request !3524
 2016-04-13 09:53:13 +00:00
Robert Schilling 2b036025d6 Update tests for moving issues via API 2016-04-13 11:31:50 +02:00
Achilleas Pipinellis 244219376d Tie example config to JIRA screenshot 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
 2016-04-13 12:28:07 +03:00
Robert Schilling 482f67edb4 API: Ability to move an issue 2016-04-13 11:23:42 +02:00
Jacob Vosmaer 7478335826 Improve English, thanks Robert 2016-04-13 11:15:36 +02:00
Achilleas Pipinellis 6bb71869b8 Merge branch 'docs-new-branch-button-3886' into 'master' 
Docs for the new branch button

[ci-skip]

Closes #3886 

@axil Could you check this and make sure this is up to your standards?



See merge request !3425
 2016-04-13 09:02:14 +00:00
Achilleas Pipinellis 4a09a6c6f2 Move 'New branch from issue' feature doc to web_editor.md 
[ci skip]
 2016-04-13 11:31:06 +03:00
Rémy Coutable fc9e1be1fd Merge branch 'api-group-visibility' into 'master' 
API: Ability to update a group

This makes it much easier to update a group after introducing the group visibility.

* Closes #14991 

See merge request !3587
 2016-04-13 08:23:29 +00:00