home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 22:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,272 Commits 48 Branches 340 Tags
ec71edfeddc403df5dcff1300e3f4868554c5f61
Commit Graph
3990 Commits
Author SHA1 Message Date
Alejandro Rodríguez 1ff896f2bf Escaping the object_link_text on cross project milestone references 2016-04-20 22:12:43 -03:00
Alejandro Rodríguez 6d9794d42a Transforming milestones link references to the short reference form 2016-04-20 22:12:43 -03:00
Alejandro Rodríguez 375e83bb57 Consistently using iid when treating milestones as referrables 
Also, addint a suffix to the reference text when the milestone is in another project
 2016-04-20 22:12:43 -03:00
Alejandro Rodríguez 077f9a4eee Implementing special GitLab markdown reference for milestones 
Using the syntax proposed in #13829 [project_reference]%(milestone_id | milestone_name)
to get a link to the referred milestone.
 2016-04-20 22:12:43 -03:00
Robert Speicher 7e6d59067e Merge branch 'fix-grape-internal-allowed-action' into 'master' 
Fix setting of "action" for Grape transactions

After wondering why we're not getting all the data in Grafana that I
wanted I realized I wasn't setting the "action" field properly here.

See merge request !3842
 2016-04-20 21:27:43 +00:00
Yorick Peterse a257d117a0 Fix setting of "action" for Grape transactions 
Merely setting the "action" tag will only result in the transaction
itself containing a value for this tag. To ensure other metrics also
contain this tag we must set the action using Transaction#action=
instead.
 2016-04-20 22:42:52 +02:00
Robert Speicher 0f309794e7 Merge branch 'sentry-js' into 'master' 
Add Sentry logging for JavaScript errors

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

See merge request !3795
 2016-04-20 19:52:27 +00:00
Tomasz Maczukin a84d0204bf Fix Build#append_trace method usage when trace file doesn't exists yet 2016-04-20 11:54:06 +02:00
Tomasz Maczukin 4019b0d872 Fix some typos in documentation 
[ci skip]
 2016-04-20 11:54:06 +02:00
Tomasz Maczukin 0725c28069 Add documentation of incremental trace update API 
[ci skip]
 2016-04-20 11:54:05 +02:00
Tomasz Maczukin dd29283a88 Make sure that appending is done on a valid length 2016-04-20 11:53:44 +02:00
Tomasz Maczukin 360bd831bf Add range checking 2016-04-20 11:53:43 +02:00
Tomasz Maczukin 38a1378e63 Add incremental build trace update API 2016-04-20 11:53:39 +02:00
Rémy Coutable d712789054 Merge branch 'slack_wiki_notifications' into 'master' 
add slack notifications for wiki pages

## What does this MR do?

Lets the Slack service be configured to send notifications when wiki pages are created or edited.

## Are there points in the code the reviewer needs to double check?

I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)

## Why was this MR needed?

Related to #563 and fixes #4233.



See merge request !2998
 2016-04-20 08:12:48 +00:00
Robert Speicher 3d4875f86a 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 01:38:49 +00:00
Sebastian Klier a88f0a1fd8 add wiki_page helper to url_builder 2016-04-20 08:25:41 +08:00
Arinde Eniola 3e7a8b0789 place the sentry config into a new file, and some changes 2016-04-19 22:04:52 +01:00
Robert Speicher 6a19467c41 Merge branch '15139-fix-constants-redefinition-warnings' into 'master' 
Define constants only if not defined yet and freeze them

Fixes #15139.

See merge request !3810
 2016-04-19 19:21:50 +00:00
Yorick Peterse 229f3ce9ce Configuring of points per UDP packet 
This allows users to configure the number of points stored in a single
UDP packet. This in turn can be used to reduce the number of UDP packets
being sent at the cost of these packets being somewhat larger.

The default setting is 1 point per packet so nothing changes for
existing users.
 2016-04-19 14:35:25 +02:00
Rémy Coutable bfa16dbcfb Merge branch 'api-fix-annotated-tags' into 'master' 
API: Present an array of Gitlab::Git::Tag instead of array of rugged tags

The annotated message was always `null` because the wrong array was presented. 

The entity requires an array of `Gitlab::Git::Tags` instead an array of raw rugged tags was presented. Since a rugged tag does not respond to `message` to get the annotated message, this was always `null`. 

See merge request !3764
 2016-04-19 12:31:31 +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
Rémy Coutable 6970612bcc Get rid of more requires, which causes warnings when code is reloaded 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-19 11:48:10 +02:00
Rémy Coutable 50bee8e919 Rename License entity to RepoLicense to avoid conflict with EE 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-19 11:08:48 +02: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
Rémy Coutable 2e9f03e514 Define constants only if not defined yet and freeze them 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-19 10:37:50 +02:00
Douglas Barbosa Alexandre f2fe4af19d Set GitHub milestones to Issue/Merge Request that were imported 2016-04-18 20:07:05 -03:00
Douglas Barbosa Alexandre 06ec511164 Import milestones from GitHub 2016-04-18 20:07:04 -03:00
Douglas Barbosa Alexandre 7462a8f90a Apply GitHub labels to Issue/Merge Request that were imported 2016-04-18 17:14:59 -03:00
Douglas Barbosa Alexandre 05a4f444c3 Import labels from GitHub 2016-04-18 17:14:59 -03:00
Robert Speicher 387b025d15 Merge branch 'gh-keep-issues-prs-references' into 'master' 
Use GitHub Issue/PR number as iid to keep references

Closes #15294 

See merge request !3759
 2016-04-18 19:32:23 +00:00
Kamil Trzcinski 3f66f4470a Make rubocop happy 2016-04-18 15:19:24 -04:00
Jacob Schatz 5f98fdcdc9 Add sentry logger to GitLab 2016-04-18 12:26:32 -04:00
Yorick Peterse b9698d2b45 Add "action" tag to /internal/allowed API 
This allows us to re-use any other analytics that rely on the "action"
tag having a value set.
 2016-04-18 17:44:24 +02:00
Douwe Maan 58665b64f5 Merge branch 'issue_3508' into 'master' 
Restrict public users for private instances

Implements #3508

See merge request !3440
 2016-04-18 15:20:13 +00:00
Douglas Barbosa Alexandre d13bba44f0 Use GitHub Issue/PR number as iid to keep references 
With these changes we don’t lost the issue/pr references when importing
them to GitLab.
 2016-04-18 12:15:50 -03:00
Kamil Trzcinski 9a2685fae0 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 10:20:51 -04:00
Kamil Trzcinski 0ce5cc9962 Resolve merge 2016-04-18 10:19:29 -04:00
Felipe Artur 2366768d3b Add changelog entry 2016-04-18 11:12:28 -03:00
Felipe Artur 820c08cefd Fix documentation and improve permissions code 2016-04-18 11:12:28 -03:00
Felipe Artur ce96d482d9 Insert users check into api 2016-04-18 11:12:27 -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
Yorick Peterse 7e6f0ac0e0 Count the number of SQL queries per transaction 
Fixes gitlab-org/gitlab-ce#15335
 2016-04-18 14:53:13 +02:00
Rémy Coutable 2f18c77e1b Update to licensee 8.0.0 and fix API specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Rémy Coutable 0aaaae9d05 Fix features specs (hopefully) 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Rémy Coutable 13804aba86 Continue implementation of the license template selector and /licenses API endpoint 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Anton DavydovandRémy Coutable 073c3d15c7 Initial implementation if license template selector and /licenses/:key API endpoint 2016-04-18 14:47:50 +02:00