summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-201-1/+1
|\ | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
| * Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-181-1/+1
| |
* | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-0/+6
|\ \ | |/ |/| | | | | Gitaly feature flag See merge request !8440
| * Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-0/+6
| |
* | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-181-0/+2
|\ \ | | | | | | | | | | | | Backport timetracking to CE See merge request !8195
| * | Backport timetracking frontend to CE.Bryce Johnson2017-01-151-0/+2
| | |
* | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-171-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Support `/merge` slash command for MRs Closes #24915 See merge request !7746
| * | refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+1
| | |
* | | change how pagination component is loadedpipelines_missing_paginationRegis2017-01-151-1/+0
| |/ |/|
* | Add basic searchClement Ho2017-01-091-0/+1
|/
* Merge branch 'master' into auto-pipelines-vueRegis2017-01-092-0/+5
|\
| * Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+1
| |\ | | | | | | | | | | | | Record and show last used date of SSH Keys See merge request !8113
| | * Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used
| * | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Moved the members and groups to single option called members Closes #25985 See merge request !8281
| | * | Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This controller is going to contain both the project members and groups options for the settings gear. Generated the route and modified the routing to point to the new members setting path
* | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-051-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
| * | | Merge branch 'monkey-patch-comment' into 'master' Rémy Coutable2017-01-051-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | Explain why we have this monkey-patch See merge request !8329
| | * | Explain why there is a monkey-patchJacob Vosmaer2016-12-271-0/+6
| | |/
* | | fix pipelines/index.html.haml merge conflictRegis2017-01-022-3/+2
|\ \ \ | |/ /
| * | Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-1/+0
| | |
| * | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routingDmitriy Zaporozhets2016-12-281-1/+1
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-261-1/+1
| |\ | | | | | | | | | | | | Add more storage statistics See merge request !7754
| | * Add more storage statisticsMarkus Koller2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
* | | merge master and fix application.rb conflictRegis2016-12-234-5/+32
|\ \ \ | |/ /
| * | Merge branch 'permit-uploadedfile-scalar' into 'master' Rémy Coutable2016-12-231-0/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Monkey-patch StrongParameters for ::UploadedFile Closes gitlab-ee#1451 See merge request !8299
| | * | Monkey-patch StrongParameters for ::UploadedFileJacob Vosmaer2016-12-231-0/+16
| | | |
| * | | Merge branch '25896-fix-404-katax-fonts' into 'master' Alfredo Sumaran2016-12-221-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "KaTeX fonts 404 on gitlab.com" Closes #25896 See merge request !8228
| | * | | Add KaTeX fonts to assets paths and precompileHiroyuki Sato2016-12-221-0/+2
| | | | |
| * | | | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-211-4/+0
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763
| | * | | Changes after reviewFilipa Lacerda2016-12-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken test Remove spinach tests for the builds tab
| | * | | Remove builds tab from commitFilipa Lacerda2016-12-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused file Fix commit link
| | * | | Removes builds tab from merge requestFilipa Lacerda2016-12-211-1/+0
| | | | | | | | | | | | | | | | | | | | Fix specs
| * | | | Merge branch 'backport-mr-widget-ci-js' into 'master' Alfredo Sumaran2016-12-211-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Backport moving MR widget CI JS out of script tag See merge request !8200
| | * | | Remove unneeded bundle refs.backport-mr-widget-ci-jsBryce Johnson2016-12-211-2/+0
| | | | |
| | * | | Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-0/+3
| | | | |
| * | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-212-1/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| | * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-205-1/+12
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Improve sourcesKamil Trzcinski2016-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`,
| | * | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-5/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1811-10/+43
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb
| | * | | | Fix configure routeLuke "Jared" Bennett2016-12-171-1/+1
| | | | | |
| | * | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-161-1/+0
| | | | | |
| | * | | | Add MattermostControllerZ.J. van de Weg2016-12-161-0/+6
| | | | | |
| | * | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-162-0/+6
| | | | | |
| * | | | | Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Added support for Authentiq OAuth provider See merge request !8038
| | * | | | Added support for Authentiq oauth providerAlex2016-12-211-0/+10
| | | |/ / | | |/| |
* | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2111-7/+48
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (367 commits) Set “Remove branch” button to default size remove unused helper method reduce common code even further to satisfy rake flay remove button class size alteration from revert and cherry pick links factor out common code to satisfy rake flay homogenize revert and cherry-pick button styles generated by commits_helper apply margin on alert banners only when there is one or more alerts Rename MattermostNotificationService back to MattermostService Rename SlackNotificationService back to SlackService Fix stage and pipeline specs and rubocop offenses Added QueryRecorder to test N+1 fix on Milestone#show Use gitlab-workhorse 1.2.1 Make 'unmarked as WIP' message more consistent Improve specs for Files API Allow unauthenticated access to Repositories Files API GET endpoints Add isolated view spec for pipeline stage partial Move test for HTML stage endpoint to controller specs Fix sizing of avatar circles; add border Fix broken test Fix broken test Changes after review ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/controllers/projects/pipelines_controller.rb app/views/projects/pipelines/index.html.haml spec/features/projects/pipelines/pipelines_spec.rb
| * | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-201-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
| | * | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-198-6/+35
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (175 commits) Fix typo Always use `fixture_file_upload` helper to upload files in tests. Add CHANGELOG Fix extra spacing in all rgba methods in status file Improve spacing and fixes manual status color Add `ci-manual` status CSS with darkest gray color Move admin application spinach test to rspec Move admin deploy keys spinach test to rspec Fix CI/CD statuses actions' CSS on pipeline graphs Fix rubocop failures Store mattermost_url in settings Improve Mattermost Session specs Ensure the session is destroyed Improve session tests Setup mattermost session Fix link from doc/development/performance.md to 'Performance Monitoring' Fix query in Projects::ProjectMembersController to fetch members Improve test for sort dropdown on members page Fix sort dropdown alignment Undo changes on members search button stylesheet ...
| | * | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Endpoint: /group/project/pipelines/id/stage.json?stage=name Call: stage_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline, stage: stage.name) ```