summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev_issue_15331' into 'master' Robert Speicher2016-04-211-3/+2
|\ | | | | | | | | | | | | | | | | Fixes window.opener bug Adds `noreferrer` value to rel attribute for external links REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331 See merge request !1953
| * Fix failing specAlfredo Sumaran2016-04-211-2/+1
| |
| * Add noreferrer value to rel attribute for external linksAlfredo Sumaran2016-04-201-1/+1
| |
* | Use SIGTERM during Sidekiq memory shutdownJacob Vosmaer2016-04-211-2/+2
| | | | | | | | This makes the memory killer behave more like 'sidekiqctl stop'.
* | Revert "Merge branch 'sentry-js' into 'master' "Jacob Schatz2016-04-211-1/+0
| | | | | | | | | | This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab.
* | Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon2016-04-211-15/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project label ref used with invalid project When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception. Closes #15168 See merge request !3811
| * | Refactor banzai code that finds cross-project labelsGrzegorz Bizon2016-04-211-15/+21
| | |
| * | Fix cross-project label ref with invalid projectGrzegorz Bizon2016-04-211-1/+1
| |/ | | | | | | Closes #15168
* | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-212-23/+17
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-1912-48/+231
| |\ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | Write specs for this featureKamil Trzcinski2016-04-161-6/+13
| | |
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1628-176/+295
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1314-18/+142
| |\ \ \
| * | | | Fix create_next_builds methodKamil Trzcinski2016-04-121-19/+0
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-113-18/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | | | Fix specsKamil Trzcinski2016-04-111-4/+10
| | | | | |
| * | | | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-111-1/+1
| | | | | |
* | | | | | Merge branch 'fix-grape-internal-allowed-action' into 'master' Robert Speicher2016-04-202-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Fix setting of "action" for Grape transactionsYorick Peterse2016-04-202-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 Speicher2016-04-201-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-jsArinde Eniola2016-04-191-1/+1
| | | | | | |
| * | | | | | Add sentry logger to GitLabJacob Schatz2016-04-181-0/+1
| | | | | | |
* | | | | | | Fix Build#append_trace method usage when trace file doesn't exists yetTomasz Maczukin2016-04-201-2/+3
| | | | | | |
* | | | | | | Fix some typos in documentationTomasz Maczukin2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Add documentation of incremental trace update APITomasz Maczukin2016-04-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Make sure that appending is done on a valid lengthTomasz Maczukin2016-04-201-1/+11
| | | | | | |
* | | | | | | Add range checkingTomasz Maczukin2016-04-202-4/+18
| | | | | | |
* | | | | | | Add incremental build trace update APITomasz Maczukin2016-04-201-0/+9
| | | | | | |
* | | | | | | Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable2016-04-201-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_builderSebastian Klier2016-04-201-0/+6
| | | | | | | |
* | | | | | | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-203-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-12804Rémy Coutable2016-04-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Update to licensee 8.0.0 and fix API specsRémy Coutable2016-04-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Fix features specs (hopefully)Rémy Coutable2016-04-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Continue implementation of the license template selector and /licenses API ↵Rémy Coutable2016-04-182-13/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov2016-04-182-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoint
* | | | | | | | Merge branch '15139-fix-constants-redefinition-warnings' into 'master' Robert Speicher2016-04-191-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-warningsRémy Coutable2016-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Define constants only if not defined yet and freeze themRémy Coutable2016-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Configuring of points per UDP packettoggle-points-per-packetYorick Peterse2016-04-191-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 Coutable2016-04-191-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 tagsRobert Schilling2016-04-171-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'make-before-after-overridable' into 'master' Kamil Trzciński2016-04-191-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-overridableKamil Trzcinski2016-04-181-12/+15
| | | | | | | | |
| * | | | | | | | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-15/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-182-13/+64
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-27/+33
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-171-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 jobKamil Trzcinski2016-04-161-11/+11
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'after-script' into 'master' Kamil Trzciński2016-04-191-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