summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-051-0/+4
|\ | | | | | | | | Add sentry JS See merge request !6764
| * Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-044-1/+47
| |\ | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0416-101/+199
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0310-45/+126
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-282-0/+17
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-2828-69/+416
| |\ \ \ \ \
| * | | | | | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-281-0/+4
| | | | | | |
* | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0420-102/+261
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
| * | | | | | Update last_repository_updated_at when the wiki is updatedDouglas Barbosa Alexandre2017-05-041-1/+1
| | | | | | |
| * | | | | | Update last_repository_updated_at when a push event is createdDouglas Barbosa Alexandre2017-05-041-0/+6
| | | | | | |
| * | | | | | Set last_repository_updated_at to created_at upon project creationDouglas Barbosa Alexandre2017-05-041-0/+5
| | | | | | |
| * | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+35
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018
| | * | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+35
| | | | | | |
| * | | | | | Merge branch 'always-show-latest-pipeline-in-commit-box' into 'master' Kamil Trzciński2017-05-041-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always show latest pipeline info in commit box Closes #31378 See merge request !11038
| | * | | | | | Rename latest_pipeline to last_pipelinealways-show-latest-pipeline-in-commit-boxLin Jen-Shin2017-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it might be confusing that it's not the same as Pipeline#latest Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11038#note_28677090
| | * | | | | | Always show latest pipeline info in commit boxLin Jen-Shin2017-05-031-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'zj-chat-message-pretty-time' into 'master' Sean McGivern2017-05-042-7/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert seconds to minutes and hours on chat notifations See merge request !11054
| | * | | | | | | Convert seconds to minutes and hours on chat notifationszj-chat-message-pretty-timeZ.J. van de Weg2017-05-042-7/+14
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the pipeline message, the duration of the pipeline was shown as: > gitlab-org/gitlab-ee: Pipeline #8002259 of master branch by Douwe Maan failed in 8612 seconds But this many seconds only gave me a clue how long the pipeline took, so now this will be shown as something like: 02:20:12 which gives a much better measure of time.
| * | | | | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+8
| |/ / / / / /
| * | | | | | Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵Douwe Maan2017-05-031-19/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' removes the possibility of commit messages having carriage returns Closes #31671 See merge request !11077
| | * | | | | | removes the possibility of commit messages having carriage returnsTiago Botelho2017-05-031-19/+23
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' Sean McGivern2017-05-037-23/+67
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388
| | * | | | | | Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diffDouwe Maan2017-05-037-23/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | versions
| * | | | | | | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-034-50/+85
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048
| | * | | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-034-50/+85
| | |/ / / / /
| * | | | | | Include missing project attributes to Import/ExportJames Lopez2017-05-031-0/+15
| |/ / / / /
* | | | | | First round of updates from the code review.Ruben Davila2017-05-021-0/+1
|/ / / / /
* | | | | Merge branch '30272-bvl-reject-more-namespaces' into 'master' Douwe Maan2017-05-024-5/+13
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Reject more reserved paths Closes #30272 See merge request !10413
| * | | | Refresh the markdown cache if it was `nil`Bob Van Landuyt2017-05-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | If the cached html_field for a markdown_field is `nil` while the mfarkdown_field is not, it needs to be refreshed.
| * | | | Rename `NamespaceValidator` to `DynamicPathValidator`Bob Van Landuyt2017-05-013-3/+3
| | | | | | | | | | | | | | | | | | | | This reflects better that it validates paths instead of a namespace model
| * | | | Use the namespace validator for validating all pathsBob Van Landuyt2017-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Since the namespacevalidator now knows the difference between a top-level and another path, this could all be handled there.
| * | | | Check `has_parent?` for determining validation typeBob Van Landuyt2017-05-011-0/+4
| | | | |
| * | | | Streamline the path validation in groups & projectsBob Van Landuyt2017-05-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Project` uses `ProjectPathValidator` which is now a `NamespaceValidator` that skips the format validation. That way we're sure we are using the same collection of reserved paths. I updated the path constraints to reflect the changes: We now allow some values that are only used on a top level namespace as a name for a nested group/project.
* | | | | Merge branch 'gitaly-branch-tag-count' into 'master' Sean McGivern2017-05-021-7/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly for getting Branch/Tag counts Closes gitaly#157 See merge request !10780
| * | | | | Cleanupgitaly-branch-tag-countKim "BKC" Carlbäcker2017-04-281-3/+1
| | | | | |
| * | | | | Use Gitaly for getting Branch/Tag countsKim "BKC" Carlbäcker2017-04-281-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Backup-rake-spec fixed. Storage config broken - Use rugged to compare branch/tag-count in specs - upgrade gitaly
* | | | | | Merge branch '26488-target-disabled-mr' into 'master' Sean McGivern2017-05-022-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 when upstream disabled merge requests Closes #26488 See merge request !10427
| * | | | | | Fix 404 when upstream has disabled merge requestsmhasbini2017-04-272-0/+15
| | | | | | |
* | | | | | | Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-012-24/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewers for snippets See merge request !10747
| * | | | | | | Use blob viewers for snippetsDouwe Maan2017-04-302-24/+61
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quicklySean McGivern2017-05-011-9/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gitaly::Commit#is_ancestor Closes #30586 See merge request !10634
| * | | | | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-281-9/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | - Upgrade Gitaly-version
* | | | | | Merge branch 'dm-video-viewer' into 'master' Sean McGivern2017-04-282-0/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Add video blob viewer See merge request !10749
| * | | | | Display video blobs in-line like imagesdm-video-viewerDouwe Maan2017-04-282-0/+14
| |/ / / /
* | | | | Merge branch 'dz-improve-add-users-method' into 'master' Douwe Maan2017-04-281-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Collect all users by single query when using Member#add_users See merge request !10975
| * | | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-methodDmitriy Zaporozhets2017-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' Sean McGivern2017-04-281-0/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve text on todo list when the todo action comes from yourself Closes #28020 See merge request !10594
| * | | | | Improve text on todo list when the todo action comes from yourselfJacopo2017-04-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx"
* | | | | | Add board_move slash commandAlex Sanford2017-04-281-0/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-2819-58/+383
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566
View Lorry Controller Status