Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-api | Rémy Coutable | 2017-08-08 | 7 | -0/+93 |
| | | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch '31207-clean-locked-merge-requests' into 'master' | Stan Hu | 2017-08-08 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207 | ||||
| * | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 1 | -2/+2 |
| | | |||||
* | | Support references to group milestones | Sean McGivern | 2017-08-07 | 1 | -1/+4 |
|/ | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references. | ||||
* | Fix the /projects/:id/repository/branches endpoint to handle dots in the ↵ | Rémy Coutable | 2017-07-27 | 3 | -0/+61 |
| | | | | | | branch name when the project full patch contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'mr-branch-link-use-tree' into 'master' | Robert Speicher | 2017-07-12 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | MR branch link now links to tree instead of commits Closes #34243 See merge request !12763 | ||||
| * | Make commits behind text a link to the target branch commits page | Clement Ho | 2017-07-11 | 1 | -0/+1 |
| | | |||||
| * | Convert target branch link to use tree | Clement Ho | 2017-07-11 | 1 | -1/+1 |
| | | |||||
* | | Return `is_admin` attribute in the GET /user endpoint for admins | Rémy Coutable | 2017-07-12 | 1 | -0/+34 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Support multiple Redis instances based on queue type | Paul Charlton | 2017-07-11 | 16 | -6/+141 |
|/ | |||||
* | Native group milestones | Felipe Artur | 2017-07-07 | 4 | -4/+8 |
| | |||||
* | Encode certificate-authority-data in base64 | Lin Jen-Shin | 2017-07-06 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfig | Lin Jen-Shin | 2017-07-06 | 3 | -11/+95 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (888 commits) Fix Rubocop offense Use a previous approach for cycle analytics dummy pipeline Allow admin to disable all restricted visibility levels Removes file_name_regex from Gitlab::Regex Remove IIFEs around several javascript classes Update CHANGELOG.md for 9.3.5 Add ProjectPathHelper cop Create and use project path helpers that only need a project, no namespace Handles realtime with 2 states for environments table Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" Allow creation of files and directories with spaces in web UI Disable Flipper memoizer in tests to avoid transient failures Introduce cache policies for CI jobs fix sidebar padding for full-width items (Time Tracking help) Replace 'snippets/snippets.feature' spinach with rspec Rename ci_config_file to ci_config_path Add back Pipeline#ci_yaml_file_path due to all the troubles Revert change to design. Go back to scrollable page Fix cycle analytics tests by making pipeline valid Fixes the column widths for the new navigation options in settings ... | ||||
| * | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -11/+11 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branch | Pawel Chojnacki | 2017-06-22 | 1 | -0/+26 |
| |\ | | | | | | | | | | 28717-additional-metrics-review-branch | ||||
| | * | add a spec for no-href link parsing | http://jneen.net/ | 2017-06-19 | 1 | -0/+26 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into ↵ | Pawel Chojnacki | 2017-06-16 | 1 | -1/+1 |
| |\ \ | | |/ | | | | | | | 28717-additional-metrics-review-branch | ||||
| * | | Merge remote-tracking branch 'upstream/master' into ↵ | Pawel Chojnacki | 2017-06-07 | 2 | -0/+45 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch # Conflicts: # app/models/project_services/prometheus_service.rb # app/views/projects/services/_form.html.haml | ||||
| * | | | Add schema matcher for non response objects + use schema to test additional ↵ | Pawel Chojnacki | 2017-06-06 | 1 | -0/+58 |
| | | | | | | | | | | | | | | | | metrics compliance | ||||
* | | | | Generate KUBECONFIG in KubernetesService#predefined_variables | Lin Jen-Shin | 2017-06-16 | 2 | -0/+37 |
| |_|/ |/| | | |||||
* | | | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master' | Douwe Maan | 2017-06-07 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820 | ||||
| * | | spec updates | Phil Hughes | 2017-05-31 | 1 | -1/+1 |
| |/ | |||||
* | | Remove deleted_at from Entity. Use find_by. Remove returns. | Shinya Maeda | 2017-05-30 | 1 | -2/+1 |
| | | |||||
* | | Include owner for pipeline_schedules. Improve N+1 spec. Use PipelineBasic ↵ | Shinya Maeda | 2017-05-30 | 1 | -23/+1 |
| | | | | | | | | for small payload. | ||||
* | | Add API support for pipeline schedule | Shinya Maeda | 2017-05-30 | 2 | -0/+68 |
|/ | |||||
* | Expose remove_source_branch boolean/null | Oswaldo Ferreira | 2017-05-24 | 1 | -1/+2 |
| | |||||
* | Stop loading MergeRequestEntity data on sidebar request | Oswaldo Ferreira | 2017-05-18 | 2 | -2/+2 |
| | |||||
* | Add new_blob_path to MR json schema | Oswaldo Ferreira | 2017-05-16 | 1 | -0/+1 |
| | |||||
* | Merge request widget redesign | Fatih Acet | 2017-05-09 | 2 | -0/+112 |
| | |||||
* | Real time pipeline show action | Zeger-Jan van de Weg | 2017-05-06 | 1 | -0/+354 |
| | |||||
* | [Multiple issue assignee]: reslving some conflicts | Valery Sizov | 2017-05-04 | 1 | -3/+1 |
| | |||||
* | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 2 | -1/+36 |
| | |||||
* | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵ | Sean McGivern | 2017-05-04 | 1 | -0/+25 |
|\ | | | | | | | | | | | | | | | 'master' Handle incoming emails from aliases correctly See merge request !11079 | ||||
| * | Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-come | Sean McGivern | 2017-05-03 | 1 | -0/+25 |
| | | | | | | | | | | These set the 'actual' destination email in one of the Delivered-To lines, so check those too. | ||||
* | | Allow to create new branch and empty WIP merge request from issue page | Alfredo Sumaran | 2017-05-04 | 2 | -0/+24 |
|/ | |||||
* | Merge branch 'metrics-deployment-history' into 'master' | Douwe Maan | 2017-05-02 | 1 | -0/+58 |
|\ | | | | | | | | | | | | | Metrics deployment history Closes #26914 See merge request !10649 | ||||
| * | Cleanup deploymentsd controller spec and use schema validation to test the ↵ | Pawel Chojnacki | 2017-04-24 | 1 | -0/+58 |
| | | | | | | | | output | ||||
* | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' | Sean McGivern | 2017-04-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix rendering emoji inside a string | blackst0ne | 2017-04-25 | 1 | -1/+1 |
| | | | |||||
* | | | Don't display the `is_admin?` flag for user API responses. | Timothy Andrew | 2017-04-25 | 1 | -2/+0 |
| |/ |/| | | | | | | | | | | | | | | | | | | | - To prevent an attacker from enumerating the `/users` API to get a list of all the admins. - Display the `is_admin?` flag wherever we display the `private_token` - at the moment, there are two instances: - When an admin uses `sudo` to view the `/user` endpoint - When logging in using the `/session` endpoint | ||||
* | | After Trace#limit, we seek to the next line in case | Lin Jen-Shin | 2017-04-13 | 1 | -0/+5 |
|/ | | | | of breaking ANSI sequence or Unicode | ||||
* | Added mock deployment and monitoring service with environments fixtures | Kamil Trzciński | 2017-04-05 | 1 | -0/+1 |
| | |||||
* | Change Done column to Closed in issue boards | blackst0ne | 2017-03-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-07 | 1 | -0/+5 |
|\ | |||||
| * | SanitizationFilter allows html5 details and summary (Issue #21605) | James | 2017-03-06 | 1 | -0/+5 |
| | | | | | | | | Also adds details/summary tags to Copy-as-GFM | ||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-06 | 6 | -0/+330 |
|\ \ | |/ | |||||
| * | Remove "subscribed" field from API responses returning list of issues or ↵api-drop-subscribed | Adam Niedzielski | 2017-03-06 | 4 | -0/+330 |
| | | | | | | | | merge requests | ||||
| * | Move schema definitions for our public API to a separate directory | Adam Niedzielski | 2017-03-06 | 2 | -0/+0 |
| | | |||||
* | | [Issue board sorting] Specs | Valery Sizov | 2017-02-28 | 1 | -0/+1 |
|/ | |||||
* | Use newer mail_room to get `require_relative` support | Gabriel Mazetto | 2017-02-20 | 2 | -0/+0 |
| |