Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 1 | -1/+0 |
| | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 | ||||
* | Merge branch ↵ | Sean McGivern | 2017-09-07 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619 | ||||
| * | Restore some changes from !9199 | Rubén Dávila | 2017-09-06 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-09-06 | 13 | -2/+1337 |
|\ \ | |/ | | | | | ee_issue_928_backport | ||||
| * | Add spec (Halfway) | Shinya Maeda | 2017-09-04 | 2 | -8/+9 |
| | | |||||
| * | Extend API: Pipeline Schedule Variable | Shinya Maeda | 2017-09-04 | 1 | -0/+11 |
| | | |||||
| * | Merge branch 'issue-discussions-refactor' into 'master' | Jacob Schatz | 2017-09-02 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069 | ||||
| | * | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-31 | 2 | -2/+14 |
| | |\ | |||||
| | * \ | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-30 | 2 | -9/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb | ||||
| | * | | | Fix merge request json schema (add labels, milestone) | Jarka Kadlecova | 2017-08-11 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Validate unescaped `%` chars in PO files | Bob Van Landuyt | 2017-09-01 | 1 | -0/+21 |
| | | | | | |||||
| * | | | | Take `nplurals` into account when validating translations. | Bob Van Landuyt | 2017-08-31 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Check for newlines in different methods on TranslationEntry | Bob Van Landuyt | 2017-08-31 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Validate the number of plurals in an entry | Bob Van Landuyt | 2017-08-31 | 2 | -24/+22 |
| | | | | | |||||
| * | | | | Check newlines in translations | Bob Van Landuyt | 2017-08-31 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | Add spec for languages without plurals | Bob Van Landuyt | 2017-08-31 | 2 | -0/+50 |
| | | | | | |||||
| * | | | | Add a linter for PO files | Bob Van Landuyt | 2017-08-31 | 4 | -0/+1220 |
| | |_|/ | |/| | | |||||
| * | | | Add time stats to API schema for issue and merge request end points | Travis Miller | 2017-08-29 | 2 | -2/+14 |
| | |/ | |/| | |||||
* | | | Backport specs | Felipe Artur | 2017-08-31 | 1 | -0/+5 |
| | | | |||||
* | | | Continue BE backport | Felipe Artur | 2017-08-31 | 1 | -0/+1 |
|/ / | |||||
* | | Changed all font-weight values to 400 and 600 | Dimitrie Hoekstra | 2017-08-24 | 2 | -9/+9 |
|/ | |||||
* | Merge branch '35098-raise-encoding-confidence-threshold' into 'master' | Sean McGivern | 2017-08-08 | 1 | -0/+42 |
|\ | | | | | | | | | | | | | Raise encoding confidence threshold to 50 Closes #35098 See merge request !12990 | ||||
| * | Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-threshold | Lin Jen-Shin | 2017-08-08 | 1 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | | If we set `ENCODING_CONFIDENCE_THRESHOLD` to 40, this test case would not pass. If we raise to 50, this would pass. Note that if in the future rugged didn't return corrupt data, this would be less relevant. But still icu recommend the threshold to be 50, we should just stick with 50. | ||||
* | | Merge branch 'rc/fix-commits-api' into 'master' | Sean McGivern | 2017-08-08 | 7 | -0/+93 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370 | ||||
| * | | 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> | ||||
* | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵ | Rémy Coutable | 2017-08-08 | 3 | -0/+37 |
|/ | | | | | | 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 |
|/ |