summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-251-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
| * | | Removed usage of normilizeEmojiName methodemoji-unicode-fixPhil Hughes2016-04-221-2/+1
| | | | | | | | | | | | | | | | Fixed some Ruby based on feedback
| * | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512
* | | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-251-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
| * | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-215-41/+40
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-203-1/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2016-40/+289
| |\ \ \ \ \
| * | | | | | Add shortcut_path to GonHelper moduleAlfredo Sumaran2016-04-181-0/+1
| | | | | | |
* | | | | | | Merge branch 'rs-503-page' into 'master' Dmitriy Zaporozhets2016-04-252-2/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a branded 503 static error page [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398 See merge request !3894
| * | | | | | Add a branded 503 static error pagers-503-pageRobert Speicher2016-04-222-2/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
* | | | | | Merge branch 'fix-project-hook-delete-permissions' into 'master' Rémy Coutable2016-04-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent users from deleting Webhooks via API they do not own Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576 See merge request !1959
| * | | | | | Prevent users from deleting Webhooks via API they do not ownStan Hu2016-04-241-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
* | | | | | Fix some typosTomasz Maczukin2016-04-221-1/+1
| | | | | |
* | | | | | Modify code formattingTomasz Maczukin2016-04-221-3/+1
| | | | | |
* | | | | | Simplify the GitlabCiYamlProcessor#initial_parsing methodTomasz Maczukin2016-04-221-16/+11
| | | | | |
* | | | | | Add posibility to define a hidden job without 'script' in .gitlab-ci.ymlTomasz Maczukin2016-04-221-4/+7
|/ / / / /
* | | | | 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>