delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Fix setting of "action" for Grape transactions	Yorick Peterse	2016-04-20	2	-1/+10
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \|	Merge branch 'sentry-js' into 'master'	Robert Speicher	2016-04-20	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Sentry logging for JavaScript errors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675 See merge request !3795
\| * \| \| \| \| \| \|	place the sentry config into a new file, and some changessentry-js	Arinde Eniola	2016-04-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add sentry logger to GitLab	Jacob Schatz	2016-04-18	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix Build#append_trace method usage when trace file doesn't exists yet	Tomasz Maczukin	2016-04-20	1	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix some typos in documentation	Tomasz Maczukin	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Add documentation of incremental trace update API	Tomasz Maczukin	2016-04-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Make sure that appending is done on a valid length	Tomasz Maczukin	2016-04-20	1	-1/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add range checking	Tomasz Maczukin	2016-04-20	2	-4/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add incremental build trace update API	Tomasz Maczukin	2016-04-20	1	-0/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'slack_wiki_notifications' into 'master'	Rémy Coutable	2016-04-20	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	add wiki_page helper to url_builder	Sebastian Klier	2016-04-20	1	-0/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'license-templates-and-api-12804' into 'master'	Robert Speicher	2016-04-20	3	-0/+71
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
\| * \| \| \| \| \| \| \|	Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804	Rémy Coutable	2016-04-19	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Update to licensee 8.0.0 and fix API specs	Rémy Coutable	2016-04-18	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix features specs (hopefully)	Rémy Coutable	2016-04-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Continue implementation of the license template selector and /licenses API ↵	Rémy Coutable	2016-04-18	2	-13/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Initial implementation if license template selector and /licenses/:key API ↵	Anton Davydov	2016-04-18	2	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	endpoint
* \| \| \| \| \| \| \| \|	Merge branch '15139-fix-constants-redefinition-warnings' into 'master'	Robert Speicher	2016-04-19	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define constants only if not defined yet and freeze them Fixes #15139. See merge request !3810
\| * \| \| \| \| \| \| \| \|	Get rid of more requires, which causes warnings when code is reloaded15139-fix-constants-redefinition-warnings	Rémy Coutable	2016-04-19	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Define constants only if not defined yet and freeze them	Rémy Coutable	2016-04-19	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Configuring of points per UDP packettoggle-points-per-packet	Yorick Peterse	2016-04-19	1	-3/+4
\| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \|	Merge branch 'api-fix-annotated-tags' into 'master'	Rémy Coutable	2016-04-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	API: Present an array of Gitlab::Git::Tag instead of array of rugged tags	Robert Schilling	2016-04-17	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'make-before-after-overridable' into 'master'	Kamil Trzciński	2016-04-19	1	-15/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	Make rubocop happymake-before-after-overridable	Kamil Trzcinski	2016-04-18	1	-12/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'after-script' into make-before-after-overridable	Kamil Trzcinski	2016-04-18	1	-15/+0
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'after-script' into make-before-after-overridable	Kamil Trzcinski	2016-04-18	2	-13/+64
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'after-script' into make-before-after-overridable	Kamil Trzcinski	2016-04-18	1	-27/+33
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'after-script' into make-before-after-overridable	Kamil Trzcinski	2016-04-17	1	-9/+9
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* after-script: Add CHANGELOG and documentation Rename finally_script to after_script Conflicts: lib/ci/gitlab_ci_yaml_processor.rb spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Allow the before_script and finally_script to be overwritten in context of job	Kamil Trzcinski	2016-04-16	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'after-script' into 'master'	Kamil Trzciński	2016-04-19	1	-18/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Resolve mergeafter-script	Kamil Trzcinski	2016-04-18	1	-15/+0
\| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into after-script	Kamil Trzcinski	2016-04-18	1	-3/+37
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into after-script	Kamil Trzcinski	2016-04-18	1	-10/+27
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop complains	Kamil Trzcinski	2016-04-18	1	-27/+33
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Rename finally_script to after_script	Kamil Trzcinski	2016-04-17	1	-6/+6
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Implement finally_script which allows to do cleanups as part of the build ↵	Kamil Trzcinski	2016-04-16	1	-2/+8
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	process
* \| \| \| \| \| \| \| \| \|	Using single builder for push and tag events	Gabriel Mazetto	2016-04-19	1	-20/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Added System Hooks for push and tag_push	Gabriel Mazetto	2016-04-19	1	-1/+21
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code is based on Project Webhooks, removing deprecations and without commits listing.
* \| \| \| \| \| \| \| \|	Set GitHub milestones to Issue/Merge Request that were imported	Douglas Barbosa Alexandre	2016-04-18	2	-0/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Import milestones from GitHub	Douglas Barbosa Alexandre	2016-04-18	2	-1/+60
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Apply GitHub labels to Issue/Merge Request that were imported	Douglas Barbosa Alexandre	2016-04-18	1	-0/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Import labels from GitHub	Douglas Barbosa Alexandre	2016-04-18	2	-1/+34
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gh-keep-issues-prs-references' into 'master'	Robert Speicher	2016-04-18	2	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GitHub Issue/PR number as iid to keep references Closes #15294 See merge request !3759
\| * \| \| \| \| \| \| \|	Use GitHub Issue/PR number as iid to keep references	Douglas Barbosa Alexandre	2016-04-18	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With these changes we don’t lost the issue/pr references when importing them to GitLab.
* \| \| \| \| \| \| \| \|	Add "action" tag to /internal/allowed API	Yorick Peterse	2016-04-18	1	-2/+4
\| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to re-use any other analytics that rely on the "action" tag having a value set.
* \| \| \| \| \| \| \|	Merge branch 'issue_3508' into 'master'	Douwe Maan	2016-04-18	1	-2/+8
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict public users for private instances Implements #3508 See merge request !3440
\| * \| \| \| \| \| \|	Add changelog entry	Felipe Artur	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix documentation and improve permissions code	Felipe Artur	2016-04-18	2	-5/+1
\| \| \| \| \| \| \| \|