summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-131-3/+3
|
* Update SystemHooks API to expose and handle new repository_update_eventsGabriel Mazetto2017-05-121-1/+1
|
* Added repository_update hookGabriel Mazetto2017-05-122-0/+45
|
* Remove trailing comma in dependency linker to satisfy RubocopStan Hu2017-05-121-1/+1
|
* Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-8/+34
|\ | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
| * Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
| * | Add hostname to usage pingSean McGivern2017-05-111-0/+1
| | |
* | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-128-133/+318
|\ \ \ | | | | | | | | | | | | | | | | Autolink package names in Gemfile See merge request !11224
| * | | Link Gemfile git URLsDouwe Maan2017-05-121-0/+3
| | | |
| * | | Autolink package names in GemfileDouwe Maan2017-05-104-10/+176
| | | |
| * | | Add Gitlab::StringRegexMarkerDouwe Maan2017-05-101-0/+13
| | | |
| * | | Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-103-123/+126
| | | |
* | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-124-2/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | | | Avoid comma t the end of hashPawel Chojnacki2017-05-122-2/+2
| | | | |
| * | | | Custom queries for prometheusPawel Chojnacki2017-05-114-2/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* | | | | Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only rename namespaces and projects with an invalid path See merge request !11338
| * | | | | Update rename_base.rbJames Lopez2017-05-121-1/+1
| | | | | |
| * | | | | Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | For exact matches, not namespaces that end with an invalid path
* | | | | Merge branch 'backport_file_filder_from_ee' into 'master' Sean McGivern2017-05-122-17/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport FileFinder from EE Closes #32188 See merge request !11319
| * | | | | Backport FileFinder from EEbackport_file_filder_from_eeValery Sizov2017-05-122-17/+33
| | | | | |
* | | | | | Merge branch 'remove-deltas-only' into 'master' Sean McGivern2017-05-121-11/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deltas_only from DiffCollection Closes gitaly#224 See merge request !11285
| * | | | | | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-111-11/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-121-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178
| * | | | | fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assigneesValery Sizov2017-05-111-4/+4
| |/ / / /
* | | | | Add a new column before creating rename triggersBob Van Landuyt2017-05-111-10/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL doesn't allow us to create a trigger for a column that doesn't exist yet. Failing with this error: ``` Mysql2::Error: Unknown column 'build_events' in 'NEW': CREATE TRIGGER trigger_6a80c097c862_insert BEFORE INSERT ON `services` FOR EACH ROW SET NEW.`build_events` = NEW.`job_events` ``` Creating the new column before creating the trigger avoids this.
* | | | Implement auxiliary blob viewersDouwe Maan2017-05-101-1/+2
| |_|/ |/| |
* | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-1029-41/+41
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| * | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-1012-12/+12
| | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-1019-29/+29
| | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-1012-37/+52
|\ \ \ | |/ / |/| | | | | | | | Security patches -> `master` See merge request !11230
| * | Use new SnippetsFinder signature in APIbvl-security-patchesBob Van Landuyt2017-05-101-2/+2
| | |
| * | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-102-2/+2
| | | | | | | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096
| * | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-104-8/+6
| | | | | | | | | | | | | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094
| * | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-101-0/+4
| | | | | | | | | | | | | | | Respect project features in wiki and blob search See merge request !2089
| * | Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-101-18/+18
| | | | | | | | | | | | | | | | | | (security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
| * | Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-103-7/+20
| | | | | | | | | | | | | | | | | | (security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
* | | Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵Dosuken shinya2017-05-101-1/+1
| | | | | | | | | | | | from 3.1.10 to 3.4.0"
* | | Merge branch 'feature/print-go-version-in-env-info' into 'master' Sean McGivern2017-05-101-0/+3
|\ \ \ | |/ / |/| | | | | | | | Print Go version in rake gitlab:env:info See merge request !11241
| * | Print Go version in rake gitlab:env:infofeature/print-go-version-in-env-infoAhmad Sherif2017-05-101-0/+3
| |/
* | Use relative paths for group/project/user avatarsblackst0ne2017-05-102-5/+16
|/
* Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-091-0/+4
|\ | | | | | | | | Don't use DiffCollection for deltas See merge request !11201
| * Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-0/+4
| |
* | Remove some unused Gitlab::Git codeJacob Vosmaer2017-05-091-50/+0
| |
* | Merge request widget redesignFatih Acet2017-05-091-4/+4
| |
* | Add index_redirect_routes_path_for_link migration to setup_postgresql.rakeLuke "Jared" Bennett2017-05-081-0/+1
|/
* Add confirm delete protected branch modalSam Rose2017-05-082-27/+51
|
* Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-081-1/+0
|\ | | | | | | | | | | | | Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
| * remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-1/+0
| |
* | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
View Lorry Controller Status