summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-319-16/+19
|
* Merge branch '30892-add-api-support-for-pipeline-schedule' into 'master'Kamil Trzciński2017-05-311-0/+4
|\ | | | | | | | | | | | | Add API support for pipeline schedule Closes #30892 See merge request !11307
| * Define last_pipeline in PipelineScheduleEntityShinya Maeda2017-05-301-4/+0
| |
| * Remove bang from update!Shinya Maeda2017-05-301-1/+1
| |
| * Add own! method on PipleineScheduleShinya Maeda2017-05-301-0/+4
| |
| * Add API support for pipeline scheduleShinya Maeda2017-05-301-0/+4
| |
* | Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-304-11/+6
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Allow to disable username on checkout url" Closes #30410 and #30174 See merge request !11792
| * | Don't allow to pass a user to ProjectWiki#http_url_to_repoRémy Coutable2017-05-301-5/+2
| | | | | | | | | | | | | | | | | | This partially reverts be25bbc4d2c7e3d5cf3da6f51cb7f7355295ef52. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Revert "Merge branch '1937-https-clone-url-username' into 'master' "Rémy Coutable2017-05-303-6/+4
| | | | | | | | | | | | | | | | | | | | | This reverts commit c425f366bfa84efab92b5d5e1d0721f16a2890bc, reversing changes made to 82f6c0f5ac4ed29390ed90592d2c431f3494d93f. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '30502-fix-bottom-padding-job-page' into 'master'Annabel Dunstone Gray2017-05-301-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove extra bottom padding on Job log page Closes #30502 See merge request !11791
| * | | Fix bottom padding for build page30502-fix-bottom-padding-job-pagekushalpandya2017-05-301-0/+4
| | | |
* | | | Avoid crash when trying to parse string with invalid UTF-8 sequenceBob Van Landuyt2017-05-301-0/+5
| | | |
* | | | Merge branch '25373-jira-links' into 'master'Rémy Coutable2017-05-301-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don’t create comment on JIRA if link already exists Closes #25373 See merge request !11485
| * | | | Don’t create comment on JIRA if link already existsJarka Kadlecova2017-05-301-3/+12
| | | | |
* | | | | Merge branch 'back-port-locked-milestones-to-ce' into 'master'Phil Hughes2017-05-309-41/+85
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | `canEdit` changes for conditional remove button on filtered search -- EE backport Closes gitlab-ee#2433 See merge request !11696
| * | | | Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ceEric Eastwood2017-05-269-41/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport Fix locked milestone in boards being remove-able. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963 Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433 Conflicts: app/assets/javascripts/boards/boards_bundle.js app/assets/javascripts/boards/filtered_search_boards.js app/assets/javascripts/filtered_search/filtered_search_manager.js spec/features/boards/boards_spec.rb
* | | | | Merge branch 'winh-merge-request-tree-symbols' into 'master'Annabel Dunstone Gray2017-05-301-6/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of tree symbols in merge requests Closes #29590 See merge request !11761
| * | | | Fix alignment of tree symbols in merge requestswinh-merge-request-tree-symbolswinh2017-05-291-6/+2
| | | | |
* | | | | Merge branch ↵Douwe Maan2017-05-306-4/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled' into 'master' 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Closes #19107 See merge request !11754
| * | | | | 'New issue'/'New merge request' dropdowns should show only projects with ↵19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabledblackst0ne2017-05-306-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | issues/merge requests feature enabled
* | | | | | Fix math rendering on blob pagesSean McGivern2017-05-301-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | `renderGFM` adds the correct syntax highlighting class and triggers KaTeX if required.
* | | | | Merge branch ↵Fatih Acet2017-05-306-43/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
| * | | | | Added specs for handleNotifications in mr_widget_options_spec.jsLuke "Jared" Bennett2017-05-263-4/+10
| | | | | |
| * | | | | Move gon ref to the index to avoid depending on gon in any mr widget objectsLuke "Jared" Bennett2017-05-262-1/+3
| | | | | |
| * | | | | Restore notifications to MR widgetLuke "Jared" Bennett2017-05-265-43/+52
| | |_|/ / | |/| | |
* | | | | Merge branch 'issue_32225_2' into 'master'Kamil Trzciński2017-05-302-5/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set head pipeline when creating merge requests See merge request !11669
| * | | | | Set head pipeline when creating merge requestsissue_32225_2Felipe Artur2017-05-292-11/+28
| | | | | |
| * | | | | Sanity check pipeline sha before saving merge request head pipelineFelipe Artur2017-05-231-2/+8
| | | | | |
* | | | | | Update looks job logFilipa Lacerda2017-05-308-344/+295
| | | | | |
* | | | | | Merge branch '31349-pipeline-url-techdeb' into 'master'Phil Hughes2017-05-303-57/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use vue file for pipelines tables components See merge request !11760
| * | | | | | Use vue file for pipelines tables components31349-pipeline-url-techdebFilipa Lacerda2017-05-293-57/+66
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' ↵Phil Hughes2017-05-305-7/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Assignee dropdown does not display selected assignee Closes #2472 See merge request !11744
| * | | | | | Backport MR from EEClement Ho2017-05-266-8/+47
| | | | | | |
* | | | | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-307-70/+110
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732
| * | | | | | | Use function to define data instead of an object31849-pipeline-show-view-realtimeFilipa Lacerda2017-05-262-4/+6
| | | | | | | |
| * | | | | | | Creates a mediator for pipeline details vue in order to mount several vue ↵Filipa Lacerda2017-05-267-70/+108
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | apps with the same data
* | | | | | | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-301-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31616-add-uptime-of-gitlab-instance-in-admin-area Closes #31616 See merge request !11590
| * | | | | | | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-291-0/+5
| | | | | | | |
* | | | | | | | Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-05-302-0/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays loading icon in async buttons inline Closes #32954 See merge request !11735
| * | | | | | | Displays loading icon in async buttons inline32954-loading-iconFilipa Lacerda2017-05-262-0/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-05-292-8/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "pipeline_schedules pages throwing error 500" Closes #32790 See merge request !11706
| * | | | | | | Use if pipeline_schedule.refShinya Maeda2017-05-291-1/+1
| | | | | | | |
| * | | | | | | Use nil? for ref evaluationShinya Maeda2017-05-291-1/+1
| | | | | | | |
| * | | | | | | Validate parameters when active is falseShinya Maeda2017-05-291-7/+3
| | | | | | | |
| * | | | | | | FixedShinya Maeda2017-05-291-1/+2
| | | | | | | |
| * | | | | | | Revert "Reproduced"Shinya Maeda2017-05-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3e0d8b4ca7d7bd0f1ce014b6caaff1b1e32b1f8f.
| * | | | | | | ReproducedShinya Maeda2017-05-291-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'Douwe Maan2017-05-293-44/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki is not searchable with Guest permissions" Closes #30917 See merge request !11613
| * | | | | | | Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissionsValery Sizov2017-05-293-21/+32
| | | | | | | |
| * | | | | | | Explicitly test that guest is able to search through the wikiValery Sizov2017-05-292-1/+7
| | | | | | | |
View Lorry Controller Status