summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix inconsistent number of branches when remote branches are presentsh-fix-branch-countStan Hu2017-08-232-1/+31
| | | | | | | | | Users of project mirrors would see that the number of branches did not match the number in the branch dropdown because remote branches were counted when Rugged was in use. With Gitaly, only local branches are counted. Closes #36934
* Merge branch 'gitaly-tree-entries-encoding' into 'master'36778-url-redirection-from-old-note-attachments-path-to-new-uploads-path-not-working36775-move-helm-chart-data-to-gitlab-ce-repo-instead-of-omnibus-docsRobert Speicher2017-08-212-2/+16
|\ | | | | | | | | | | | | Correctly encode string params for Gitaly's TreeEntries RPC Closes #36720 See merge request !13724
| * Correctly encode string params for Gitaly's TreeEntries RPCgitaly-tree-entries-encodingAlejandro Rodríguez2017-08-212-2/+16
| |
* | Merge branch ↵Clement Ho2017-08-2111-27/+69
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '36298-use-non-i18n-values-for-setting-new-group-level-issue-mr-button-text' into 'master' Use non-i18n values for setting new group-level issue/MR button text Closes #36298 See merge request !13570
| * | Use non-i18n values for setting new group-level issue/MR button textBryce Johnson2017-08-2111-27/+69
|/ /
* | Merge branch ↵Marcia Ramos2017-08-2110-8/+60
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '36533-add-docs-for-group-issues-page-and-group-merge-requests-page' into 'master' Add docs for group issues page and group merge requests page Closes #36533 See merge request !13678
| * | indexes external issue trackerMarcia Ramos2017-08-211-0/+6
| | |
| * | copyeditMarcia Ramos2017-08-214-21/+25
| | |
| * | indexes user/search/ from /user/indexMarcia Ramos2017-08-211-0/+4
| | |
| * | Wording36533-add-docs-for-group-issues-page-and-group-merge-requests-pageVictor Wu2017-08-211-5/+5
| | |
| * | Cross link to groups docsVictor Wu2017-08-211-0/+7
| | |
| * | Issue trackerVictor Wu2017-08-211-1/+1
| | |
| * | Merge requests search and filteringVictor Wu2017-08-181-0/+251
| | |
| * | Delete index.mdVictor Wu2017-08-181-251/+0
| | |
| * | Punctuation.Victor Wu2017-08-181-2/+2
| | |
| * | Search and filter results.Victor Wu2017-08-181-1/+3
| | |
| * | Update search and filter linksVictor Wu2017-08-181-1/+3
| | |
| * | Update search docsVictor Wu2017-08-181-0/+4
| | |
| * | Merge request list viewsVictor Wu2017-08-181-0/+16
| | |
| * | project_merge_requests_list_view.pngVictor Wu2017-08-181-0/+0
| | |
| * | group_merge_requests_list_view.pngVictor Wu2017-08-181-0/+0
| | |
| * | Update issue docsVictor Wu2017-08-181-6/+13
| | |
| * | project_issues_list_view.pngVictor Wu2017-08-181-0/+0
| | |
| * | group_issues_list_view.pngVictor Wu2017-08-181-0/+0
| | |
| * | Delete group_issues_list_view.pngVictor Wu2017-08-181-0/+0
| | |
| * | group_issues_list_view.pngVictor Wu2017-08-181-0/+0
| | |
| * | Delete issue_tracker.pngVictor Wu2017-08-181-0/+0
| | |
* | | Merge branch 'only-limit-fetch-when-requested' into 'master'Robert Speicher2017-08-215-19/+44
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Only require sidekiq-limit_fetch when enabled in settings Closes #36253 See merge request !13715
| * | Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requestedSean McGivern2017-08-215-19/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | This gem allows Sidekiq jobs to be throttled. Unfortunately, it has a side-effect: when we haven't enabled job throttling, it will still hit Redis a lot (and miss, because nothing is configured). As this setting already required a restart, ensure that the library is only required when it's enabled.
* | | Merge branch 'sh-fix-atom-feeds' into 'master'Sean McGivern2017-08-212-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 errors in Atom feeds due to push events Closes #36705 See merge request !13695
| * | | Fix Error 500s when viewing user or group Atom feedsStan Hu2017-08-212-0/+16
| | | |
* | | | Merge branch 'winh-projects-select-dropdown' into 'master'Clement Ho2017-08-213-2/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make project selection dropdown consistent See merge request !13562
| * | | | Make project selection dropdown consistentwinh-projects-select-dropdownwinh2017-08-203-2/+40
| |/ / /
* | | | Make RuboCop happySean McGivern2017-08-211-1/+1
| | | |
* | | | Merge branch 'fix/gb/fix-head-pipeline-when-pipeline-has-errors' into 'master'Kamil Trzciński2017-08-213-15/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge request head pipeline when pipeline has errors Closes #36657 See merge request !13664
| * | | | Add a changelog entry for merge request pipeline fixfix/gb/fix-head-pipeline-when-pipeline-has-errorsGrzegorz Bizon2017-08-191-0/+5
| | | | |
| * | | | Update merge request pipeline even if if has errorsGrzegorz Bizon2017-08-182-4/+27
| | | | |
| * | | | Make create pipeline service specs more readableGrzegorz Bizon2017-08-181-11/+27
| | | | |
* | | | | Merge branch 'backstage/gb/migrate-stages-statuses' into 'master'Kamil Trzciński2017-08-2118-22/+478
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate CI/CD stages statuses Closes #33453 See merge request !12584
| * | | | | Add specs for stage status background migration classGrzegorz Bizon2017-08-171-0/+80
| | | | | |
| * | | | | Merge branch 'backstage/gb/migrations-tests-schema-version' into ↵Grzegorz Bizon2017-08-175-28/+33
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/migrate-stages-statuses * backstage/gb/migrations-tests-schema-version: Migrate down before each migration unit test Disable db_cleaner tables caching in migrations tests Extend migrations testing documentation Make it possible to provide schema version in tests Migrate db schema for context in :migration specs
| * | | | | | Use usual method to retrieve CI/CD stage statusesGrzegorz Bizon2017-08-164-6/+6
| | | | | | |
| * | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-08-161948-20363/+31593
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1000 commits) Fix username autocomplete group name with no avatar alignment Fix 'Projected tags' typo in protected_tags_spec.rb Many Repo Fixes Repo Editor Fixes Docs: New index for permissions link article from CI index link tech articles from the landing page new articles come first fix relative link fix date format Fixed changed files dropdown not being shown Update publication date Remove deprecated field from workhorse API responses Fix API responses when dealing with txt files Make sure MySQL would not use CURRENT_TIMESTAMP Add two more project templates Allow usage of any_projects? with an Array Copyedit Artifactory and GitLab article Rename Artifactory and GitLab article file Display GPG status loading spinner only when Ajax request is made ...
| * | | | | | | Use update_column_in_batches helper in stages migrationGrzegorz Bizon2017-07-312-5/+1
| | | | | | | |
| * | | | | | | Add specs for stage update workerGrzegorz Bizon2017-07-311-0/+22
| | | | | | | |
| * | | | | | | Merge commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3' into ↵Grzegorz Bizon2017-07-311205-3419/+7563
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/migrate-stages-statuses * commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3': (270 commits) Add a note about EFS and GitLab log files Projects logo are not centered vertically on projects page Fix spec/features/projects/branches_spec Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id Fix a spec that was assuming to be on the wrong page Add copy about search terms to ux guide Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation' Fix replying to commit comments on MRs from forks Fix 500 error when rendering avatar for deleted project creator Load and process at most 100 commits when pushing into default branch Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Add log messages to clarify log messages about API CSRF token verification failure Update gitlab_flow.md, Teatro seems to be completely dead, see also https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774 Fix diff commenting results just after changing view Update CHANGELOG.md for 9.4.2 none is not a CSS Value for sizes ;-) Merge issuable "reopened" state into "opened" Make access level more compatible with EE Add link to JIRA article in docs Expand pipeline_trigger_service_spec by godfat request ...
| * \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-26267-1024/+4051
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (110 commits) Add missing colon Fix project wiki web_url spec Resolve "Memory usage notice doesn't link anywhere" Docs new topic "user/index" Implement GRPC call to RepositoryService Pending delete projects should not show in deploy keys Remove outdated ~Frontend label in CONTRIBUTING.md Fixes 500 error caused by pending delete projects in admin dashboard Add lower path index to redirect_routes Remove project_key from the Jira configuration Update CHANGELOG.md for 9.4.1 Enable gitaly_post_upload_pack by default Add `api` prefix as a top level route in the spec. Move relative_path to the element that is being clicked Bumps Gitlab Omniauth LDAP version Add directives to Vue component ordering synchronize ukrainian translation in zanata again v3 API is unsupported after 9.5, but may not be removed Fix vertical alignment in firefox and safari for pipeline mini graph Adds link_to_gfm method instrumentation ... Conflicts: db/schema.rb
| * | | | | | | | | Rename method responsible for updating stage statusGrzegorz Bizon2017-07-263-6/+8
| | | | | | | | | |
| * | | | | | | | | Move enum specific code from a concern to CI stageGrzegorz Bizon2017-07-262-5/+1
| | | | | | | | | |
| * | | | | | | | | Fix import/export for CI/CD stage commit statusesGrzegorz Bizon2017-07-241-1/+1
| | | | | | | | | |
View Lorry Controller Status