summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-261-12/+25
|
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-255-40/+33
|\ | | | | | | | | Clean up diff rendering See merge request !11390
| * Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
| |
| * Remove @commit in compare and MR controllersDouwe Maan2017-05-231-0/+3
| |
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-235-40/+28
| |
* | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-251-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Provide default for calculating label text color Closes #32728 See merge request !11681
| * | Provide default for calculating label text color (!11681)winh2017-05-251-0/+4
| | |
* | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-7/+5
|\ \ \ | | | | | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| * | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-7/+5
| | | | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* | | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-251-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix terminals support for Kubernetes service Closes #31754 See merge request !11653
| * | | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-251-12/+12
| | | | | | | | | | | | | | | | | | | | It was broken, because we introduced a default namespace, which was not used by terminal methods.
* | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-254-44/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027
| * | | | Implement web hooks loggingAlexander Randa2017-05-254-44/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover
* | | | | ensure rss token on readAlexis Reigel2017-05-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | we do this on attribute read since migrating all existing users is not a feasible solution.
* | | | | add rss_token attribute to user modelAlexis Reigel2017-05-241-1/+2
| |/ / / |/| | |
* | | | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-247-29/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system note with link to diff comparison when MR discussion becomes outdated Closes #30058 See merge request !11584
| * | | | Address reviewDouwe Maan2017-05-242-6/+9
| | | | |
| * | | | Fix specsdm-outdated-system-noteDouwe Maan2017-05-231-2/+5
| | | | |
| * | | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-236-31/+35
| | |_|/ | |/| |
* | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
| * | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-232-5/+7
| | | | |
| * | | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-232-7/+5
| | |_|/ | |/| |
* | | | Merge branch 'mrchrisw-catch-openssl' into 'master'Douwe Maan2017-05-242-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Rescue OpenSSL::SSL::SSLError in JiraService See merge request !11467
| * | | Rescue OpenSSL::SSL::SSLError in JiraService and IssueTrackerServicemrchrisw-catch-opensslChris Wilson2017-05-232-2/+2
| | |/ | |/| | | | | | | | | | | | | Add OpenSSL::SSL::SSLError to rescue in JiraService & IssueTrackerService. This will prevent an exception in production and instead display a message to the user.
* | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etagZ.J. van de Weg2017-05-221-1/+1
| | | | | | | | | | | | These were untested by the cherry picked commit.
* | | Add MISSING e-tag refresh of resource for Job, and Pipeline GraphKamil Trzcinski2017-05-221-0/+1
| |/ |/|
* | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-191-1/+1
| |
* | Merge branch 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-191-2/+7
|\ \ | | | | | | | | | | | | Remove readme project_view option See merge request !11425
| * | Remove readme project_view optionDouwe Maan2017-05-191-2/+7
| | |
* | | Merge branch 'dm-render-plain-readme' into 'master'Rémy Coutable2017-05-191-0/+1
|\ \ \ | |/ / |/| | | | | | | | Render plain README using Markup viewer so it is displayed below tree See merge request !11510
| * | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readmeDouwe Maan2017-05-181-0/+1
| | |
* | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'Robert Speicher2017-05-181-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Stop MR conflict code from blowing up when branches are missing Closes #32544 See merge request !11501
| * | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+2
| | |
* | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-1813-1/+255
|\ \ \ | |/ / |/| | | | | See merge request !11346.
| * | Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-1713-1/+255
| | |
* | | Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-182-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix root groups redirecting to group owner Closes #32474 See merge request !11465
| * | | Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843Douwe Maan2017-05-182-5/+3
| | | |
| * | | Fixes #32474Michael Kozono2017-05-171-1/+3
| |/ / | | | | | | | | | Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
* | | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-181-15/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's local_branches operation into repo code Closes #27379 See merge request !10059
| * | | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-171-15/+1
| | | |
* | | | Add auxiliary viewer for READMEdm-readme-viewerDouwe Maan2017-05-173-0/+21
| |/ / |/| |
* | | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-174-2/+21
| | |
* | | Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-05-171-1/+9
|\ \ \ | | | | | | | | | | | | | | | | Invalidate cache for issue and MR counters separately See merge request !11394
| * | | Invalidate cache for issue and MR counters more granularlycounters_cache_invalidationValery Sizov2017-05-151-1/+9
| | | |
* | | | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewerDouwe Maan2017-05-162-1/+13
| |_|/ |/| |
* | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-1610-58/+66
|\ \ \ | | | | | | | | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358
| * | | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to ↵dm-blob-viewer-concernsDouwe Maan2017-05-155-14/+22
| | | | | | | | | | | | | | | | max_size
| * | | Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-136-42/+42
| | | |
| * | | Allow blob viewer to support multiple filetypesDouwe Maan2017-05-134-7/+7
| | | |
* | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-164-6/+6
| |_|/ |/| | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
View Lorry Controller Status