summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-191-1/+1
| | | | | | | | This reduces the time spent waiting for Sidekiq jobs to complete in JobWaiter, and reduces the sleep interval when trying to acquire the lease for refreshing authorizations. These changes should reduce the time spent just waiting for a lock, which we seem to be spending most time in when running the AuthorizedProjectsWorker.
* Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-194-10/+41
|\ | | | | | | | | Add "project was moved" error messages for git See merge request !11259
| * Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-164-10/+41
| |
* | Merge branch 'add-since-and-until-params-to-issuables' into 'master'Rémy Coutable2017-06-192-0/+4
|\ \ | | | | | | | | | | | | | | | | | | add created_after and created_before params to issuables Closes #32901 See merge request !12151
| * | add since and until params to issuablesKyle Bishop2017-06-182-0/+4
| | |
* | | Merge branch '26212-upload-user-avatar-trough-api' into 'master'Rémy Coutable2017-06-191-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Accept image for avatar in user API Closes #26212 See merge request !12143
| * | | Accept image for avatar in user APIvanadium232017-06-161-0/+1
| | |/ | |/|
* | | Merge branch 'issue_33205' into 'master'Sean McGivern2017-06-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix API bug accepting wrong merge requests parameters Closes #33205 See merge request !12173
| * | | Fix API bug accepting wrong merge requests parametersissue_33205Felipe Artur2017-06-161-1/+1
| | | |
* | | | Partially revert 1e8dbd46Robert Speicher2017-06-161-2/+1
| |/ / |/| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/33736#note_32561501
* | | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-167-13/+40
|\ \ \ | | | | | | | | | | | | | | | | Add table for files in merge request diffs See merge request !12047
| * | | Add table for files in merge request diffsSean McGivern2017-06-167-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty.
* | | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-18/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764
| * | | Better exception message and some additional code commentToon Claes2017-06-151-1/+3
| | | |
| * | | Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-18/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user is authorized to a group, they are also authorized to see all the ancestor groups and descendant groups. When a user is authorized to a project, they are authorized to see all the ancestor groups too. Closes #32135 See merge request !11764
* | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-1622-41/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
| * | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-1522-41/+41
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
* | | Order issues by priorityFelipe Artur2017-06-161-2/+2
| | |
* | | Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-161-2/+2
| | |
* | | Add French translations for Cycle Analytics, Project, and Repository pages.Erwan GEORGET2017-06-151-0/+1
| | |
* | | Merge branch 'deprecate-gitaly-path' into 'master'Sean McGivern2017-06-152-11/+10
|\ \ \ | | | | | | | | | | | | | | | | Stop using deprecated `path` field on Gitaly messages See merge request !12112
| * | | Stop using deprecated `path` field on Gitaly messagesAlejandro Rodríguez2017-06-142-11/+10
| | | | | | | | | | | | | | | | | | | | This revealed an error in our configuration generation in gitlab:gitaly:install rake task. The fix is included
* | | | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-151-1/+9
| | | |
* | | | Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-151-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Don't return nil for missing objects from parser cache See merge request !12168
| * | | Don't return nil for missing objects from parser cachedm-fix-parser-cacheDouwe Maan2017-06-141-1/+1
| | | |
* | | | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-142-0/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Allow more customization to Help landing page See merge request !11878
| * | | Help landing page customizationsRobin Bobbitt2017-06-142-0/+7
| | |/ | |/|
* | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-143-2/+111
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Implement diff viewers Closes #30501 and #19931 See merge request !11777
| * | Implement diff viewersDouwe Maan2017-06-143-2/+111
| | |
* | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-6/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Backport EE changes to the Kubernetes service Closes gitlab-ee#2525 See merge request !12139
| * | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-6/+6
| | |
* | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-143-3/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Raise etag route regex miss Closes #33106 See merge request !12084
| * | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-3/+3
| | | | | | | | | | | | | | | This was edited to the request, but this won't work if the data is not available at the time of setting the key for the first time.
| * | Fix etag route missesZ.J. van de Weg2017-06-121-2/+2
| | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#33106
| * | Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
| | |
* | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-147-7/+125
|\ \ \ | | | | | | | | | | | | | | | | Add support for services configuration in .gitlab-ci.yml See merge request !8578
| * | | Remove Gitlab::Ci::Config::Entry::DockerImageTomasz Maczukin2017-06-123-34/+23
| | | |
| * | | Refactor old formad handling in lib/ci/api/entities.rbTomasz Maczukin2017-06-121-6/+2
| | | |
| * | | Rename API::Entities::JobRequest::ServiceImage to ↵Tomasz Maczukin2017-06-121-2/+2
| | | | | | | | | | | | | | | | API::Entities::JobRequest::Service
| * | | Ensure that old API v1 generates still the same outputTomasz Maczukin2017-06-121-1/+19
| | | |
| * | | Send new configuration options with job's payloadTomasz Maczukin2017-06-122-4/+15
| | | |
| * | | Add support for docker image configuration in .gitlab-ci.ymlTomasz Maczukin2017-06-125-2/+106
| |/ /
* | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-141-0/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
| * | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-1/+1
| | |
| * | Allow to access pipelines even if they are disabled, but only present jobs ↵Kamil Trzcinski2017-06-131-0/+4
| | | | | | | | | | | | and commit statuses without giving ability to access them
* | | Merge branch 'fix-github-clone-wiki' into 'master'Sean McGivern2017-06-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | GitHub - Fix token interpolation when cloning wiki repository See merge request !12107
| * | | Github - Fix token interpolation when cloning wiki repositoryDouglas Barbosa Alexandre2017-06-121-1/+1
| | | |
* | | | Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-131-0/+33
| |/ / |/| | | | | | | | 'timestamps_with_timezone'
* | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-124-0/+164
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * | | DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-barRémy Coutable2017-06-091-21/+14
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status