summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | (CE Port) Set project path on localStorage during onboardingMartin Wortschack2019-06-251-2/+2
| | | | | | |
* | | | | | | Merge branch ↵Filipa Lacerda2019-06-255-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master' Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
| * | | | | | | Remove baseEndpoint from search dropdwon63177-follow-up-from-use-scoped-routes-for-labels-and-milestonesDmitriy Zaporozhets2019-06-245-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch ↵Grzegorz Bizon2019-06-251-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'require-pipeline-when-enabling-only-allow-merge-if-pipeline-succeeds' into 'master' Pipeline must be present if "Pipeline must succeed" is set See merge request gitlab-org/gitlab-ce!29926
| * | | | | | | Use actual_head_pipeline to enforce presenceFabio Pitino2019-06-251-2/+2
| | | | | | | |
| * | | | | | | Require pipeline if "Pipeline must succeed" is setrequire-pipeline-when-enabling-only-allow-merge-if-pipeline-succeedsFabio Pitino2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user sets only_allow_merge_if_pipeline_succeeds, also named as "Pipeline must succeed" project setting, we require the pipeline to be present. This solves race condition issues especially with external CI providers when a build is triggered externally but no pipelines are created in GitLab yet. Document that a head pipeline is expected when using "Pipeline must succeed" setting. Also explain limitations with the use of only/except where there may not be any jobs created and the merge request will not be allowed to be merged.
* | | | | | | | Merge branch '60860-keep-empty-folders-in-tree' into 'master'Kushal Pandya2019-06-251-4/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep empty folders in the tree list Closes #60860 See merge request gitlab-org/gitlab-ce!29196
| * | | | | | | Keep empty folders in the tree listDenys Mishunov2019-06-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing the last file from a folder in WebIDE, do not remove the folder from the view. We keep those to give users possibility to re-upload files to the same folders. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60860
* | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-6-0' into 'master'Kamil Trzciński2019-06-251-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.6.0/12.0.0 See merge request gitlab-org/gitlab-ce!29982
| * | | | | | | Update GitLab Runner Helm Chart to 0.6.0update-gitlab-runner-helm-chart-to-0-6-0Tomasz Maczukin2019-06-241-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Allow autocompleting scoped labelsMartin Hanzel2019-06-252-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `:` key will no longer exit out of the autocomplete dialog, allowing auto-completion of labels with colons in them.
* | | | | | | Use project depended feature flag for pages sslpages-ssl-project-aware-feature-flagVladimir Shushlin2019-06-253-7/+5
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot
* | | | | | Merge branch '30355-use-hours-only-for-time-tracking' into 'master'Phil Hughes2019-06-2517-10/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit time tracking units to hours Closes #30355 See merge request gitlab-org/gitlab-ce!29469
| * | | | | | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-2517-20/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes migration and all other places the attribute is used
| * | | | | | Limit time tracking values to hoursJon Kolb2019-06-256-4/+24
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Adds an instance setting to limit display of time tracking values to hours only
* | | | | | Vue-i18n: app/assets/javascripts/issue_show directoryEzekiel Kigbo2019-06-255-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/issue_show directory
* | | | | | Merge branch 'vue-i18n-js-monitoring-directory' into 'master'Kushal Pandya2019-06-252-23/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/monitoring directory See merge request gitlab-org/gitlab-ce!29971
| * | | | | Vue-i18n: app/assets/javascripts/monitoring directoryvue-i18n-js-monitoring-directoryEzekiel Kigbo2019-06-242-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/monitoring directory
* | | | | | Merge branch 'refactor_deployment_cluster' into 'master'Stan Hu2019-06-241-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Deployment#cluster to #deployment_platform_cluster See merge request gitlab-org/gitlab-ce!29961
| * | | | | | Rename method to not clash with #clusterrefactor_deployment_clusterThong Kuah2019-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will introduce #cluster at a later stage. Also deprecate this method
| * | | | | | Move innards of cluster method to environmentThong Kuah2019-06-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment already has a memoized deployment plaform. No need to check for respond_to?(:cluster) now that all deployment platforms are Clusters::Cluster.
* | | | | | | Renew Let's Encrypt certificatesVladimir Shushlin2019-06-244-0/+41
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index for pages domain ssl auto renewal Add PagesDomain.needs_ssl_renewal scope Add cron worker for ssl renewal Add worker for ssl renewal Add pages ssl renewal worker queues settings
* | | | | | Merge branch 'vue-i18n-js-jobs-directory' into 'master'Tim Zallmann2019-06-242-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/jobs directory See merge request gitlab-org/gitlab-ce!29969
| * | | | | | Vue-i18n: app/assets/javascripts/jobs directoryvue-i18n-js-jobs-directoryEzekiel Kigbo2019-06-242-6/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/jobs directory
* | | | | | Merge branch 'sh-optimize-todos-controller' into 'master'Douglas Barbosa Alexandre2019-06-243-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries in Dashboard::TodosController Closes #43042 See merge request gitlab-org/gitlab-ce!29954
| * | | | | | Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this scope is used in both the controller and the API, we rename it to make it clear that it's used for both.
| * | | | | | Eliminate N+1 queries in Dashboard::TodosControllerStan Hu2019-06-242-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This appears to bring down the number of SQL queries on GitLab.com for my Todos page from 672 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43042
* | | | | | | Merge branch '63656-runner-tags-search-dropdown-is-empty' into 'master'Jan Provaznik2019-06-241-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Runner tags search dropdown is empty" Closes #63656 See merge request gitlab-org/gitlab-ce!29985
| * | | | | | Return all runner tags when search is empty63656-runner-tags-search-dropdown-is-emptyDmitriy Zaporozhets2019-06-241-2/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'jivanvl-add-column-chart-monitoring-dashboard' into 'master'Mike Greiling2019-06-241-0/+131
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add column chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!29293
| * | | | | | Add column chart component to the monitoring bundlejivanvl-add-column-chart-monitoring-dashboardJose Vargas2019-06-211-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge request just adds the column chart component without integrating it to the dashboard
* | | | | | | Resolve "Avatar in "Please sign in" pattern too large"Marcel van Remmerden2019-06-241-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'divergence-graph-fe-rendering' into 'master'Filipa Lacerda2019-06-247-54/+173
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render branch divergence graph with Vue See merge request gitlab-org/gitlab-ce!29743
| * | | | | | Render branch divergance graph with VuePhil Hughes2019-06-247-54/+173
| | |/ / / / | |/| | | |
* | | | | | Add identifiers for onboarding popoversMartin Wortschack2019-06-248-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add button styles for onboarding welcome page - Fix qa selector (due to additional class)
* | | | | | Merge branch 'search-blob-basenames' into 'master'Kamil Trzciński2019-06-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build correct basenames for title search results See merge request gitlab-org/gitlab-ce!29898
| * | | | | | Build correct basenames for title search resultssearch-blob-basenamesMarkus Koller2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.
* | | | | | | Add name & search parameters to project environments APILee Tickett2019-06-241-0/+29
| | | | | | |
* | | | | | | Improve group list UIDennis Tang2019-06-249-103/+102
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the groups list UI to match the style of the project list: - New layout - Improve loading state when loading group children - Larger, responsive text - Icon and text colors changed to secondary - Smaller button sizes - Content list description colors were standardized to body text
* | | | | | Merge branch 'fix-labels-in-hooks' into 'master'Ash McKenzie2019-06-241-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label serialisation in issue and note hooks Closes #63473 See merge request gitlab-org/gitlab-ce!29850
| * | | | | | Added labels_hook_attrs methodfix-labels-in-hooksJan Provaznik2019-06-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on review comment fetching labels hook_attrs is now wrapped in an issue's model method.
* | | | | | | Show create merge request button on confidential issuesPhil Hughes2019-06-243-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | | | | | | Merge branch 'fix-pipeline-schedule-edge-case' into 'master'Lin Jen-Shin2019-06-241-6/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX: Scheduled pipelines scheduled to run at the same time as pipeline_schedule_worker gets pushed to the next run Closes #63469 See merge request gitlab-org/gitlab-ce!29848
| * | | | | | | Fix pipeline schedule edge casefix-pipeline-schedule-edge-caseShinya Maeda2019-06-241-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If pipeline schedule is to run at the exact same time with when cron worker runs, the pipeline schedule will not be executed at the ideal timing. We fix this bug by comparing the exact matching of ideal and cron worker's next run at.
* | | | | | | | Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-245-44/+153
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
| * | | | | | | | Avoid touching the MR status if MR is not openedOswaldo Ferreira2019-06-212-5/+10
| | | | | | | | |
| * | | | | | | | Only force recheck when merge-ref is outdatedOswaldo Ferreira2019-06-201-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recheck flag is true, we make sure the merge-ref is indeed outdated. If it is, we update it along the merge status.
| * | | | | | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-205-44/+133
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | | | | | | | Merge branch 'gt-remove-tooltip-directive-on-project-avatar-image-component' ↵Filipa Lacerda2019-06-241-21/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove tooltip directive on project avatar image component Closes #51990 See merge request gitlab-org/gitlab-ce!29631
| * | | | | | | | Remove tooltip directive on project avatar image componentGeorge Tsiolis2019-06-211-21/+0
| | | | | | | | |