summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | Prefills commit message in edit filePhil Hughes2016-04-111-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #14488
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'build-notification-fixes' into 'master' Jacob Schatz2016-04-124-13/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build notification null check Cancels build notification interval on page change See merge request !3540
| | * | | | | | | | | | | | | | | | | | | | | Fixed failing testsbuild-notification-fixesPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Fixed missed conflictPhil Hughes2016-04-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Preparing build textPhil Hughes2016-04-112-4/+21
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Hides notification after X amount of secondsPhil Hughes2016-04-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Corrects the button color on build status changePhil Hughes2016-04-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Rubocop fixPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Preparing build statusPhil Hughes2016-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Build notification null checkPhil Hughes2016-04-112-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cancels build notification interval on page change
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-122-11/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add proper nil and error handling to SAML login process While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks. I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check. See merge request !3609
| | * | | | | | | | | | | | | | | | | | | | | | Better control flow and added guard clause.fix-missing-saml-error-handlingPatricio Cano2016-04-111-14/+9
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Add missing proper nil and error handling to SAML login process.Patricio Cano2016-04-072-18/+30
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/fix-14753' into 'master' Rémy Coutable2016-04-122-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #14753: Check if head is born before trying to detect main language This MR makes sure that head exists before trying to detect the main language. This prevents errors on repo's without a master branch. Closes #14753 See merge request !3654
| | * | | | | | | | | | | | | | | | | | | | | | | Add my nameJeroen Bobbeldijk2016-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Dont return nullJeroen Bobbeldijk2016-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Add changelog, change code to guard clauseJeroen Bobbeldijk2016-04-112-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Check head unborn in ruggedJeroen Bobbeldijk2016-04-111-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'instrument-service-classes' into 'master' Rémy Coutable2016-04-122-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675
| | * | | | | | | | | | | | | | | | | | | | | | | Changelog entry for service class instrumentationYorick Peterse2016-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | | | | | | | | | | | | Instrument all service classesinstrument-service-classesYorick Peterse2016-04-121-0/+12
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15162
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hide_help_block_when_creating_project_inside_group' into 'master' Rémy Coutable2016-04-124-4/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide help block when user is creating a new project inside a group closes #14092 ![fix](/uploads/13721117c410c8fe6937d44a3b0a90a8/fix.gif) See merge request !3427
| | * | | | | | | | | | | | | | | | | | | | | | | hide help block when user is creating a new project inside a groupArinde Eniola2016-04-124-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-127-2/+244
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete notes via API Supports deleting issues, snippets, and merge requests via the API. * Closes #14944 * Closes #14845 * Closes #6060 @zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet. @rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. See merge request !3557
| | * | | | | | | | | | | | | | | | | | | | | | | | Adapt tests to new testing guidelinesRobert Schilling2016-04-123-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Fix changelog entryRobert Schilling2016-04-121-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Fix code review issuesRobert Schilling2016-04-125-27/+140
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Delete notes via APIRobert Schilling2016-04-127-3/+135
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'api-get-tag' into 'master' Rémy Coutable2016-04-124-1/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to retrieve a single tag * Closes #14330 /cc @dblessing See merge request !3577
| | * | | | | | | | | | | | | | | | | | | | | | | | Add changelog entryRobert Schilling2016-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Fix minor styling issues from code reviewRobert Schilling2016-04-123-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | API: Ability to retrieve a single tagRobert Schilling2016-04-123-1/+76
| | | |_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-myself-from-project-api-7687' into 'master' Rémy Coutable2016-04-124-9/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a project member to leave the projected through the API Closes #7687 See merge request !3613
| | * | | | | | | | | | | | | | | | | | | | | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687Zeger-Jan van de Weg2016-04-124-9/+31
| | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'uninstrument-banzai-reference-extractor' into 'master' Rémy Coutable2016-04-121-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Un-instrument Banzai::ReferenceExtractor No changelog entry since this isn't really something new compared to 8.6, instead it adjusts something that was added for 8.7. See merge request !3676
| | * | | | | | | | | | | | | | | | | | | | | | Un-instrument Banzai::ReferenceExtractoruninstrument-banzai-reference-extractorYorick Peterse2016-04-121-3/+0
| |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrumenting this class together with Gitlab::ReferenceExtractor causes a StackError for some reason. Since Gitlab::ReferenceExtractor has most of the interesting code we'll only instrument that class.
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #10136 from samjwlee/masterAchilleas Pipinellis2016-04-131-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | (doc) fix typo to ssh keys doc url
| * | | | | | | | | | | | | | | | | | | | | | (doc) fix typo to ssh keys doc urlLee2016-04-121-4/+4
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'api-fix-milestone-iid-filter' into 'master' Rémy Coutable2016-04-123-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add iid filter to milestones This was documented in the API docs but it was never working because the iid filter was never applied to the milestones. The tests were working by accident because the were checking the first element, which was by accident the request element. * Closes https://github.com/gitlabhq/gitlabhq/issues/10122 See merge request !3588
| * | | | | | | | | | | | | | | | | | | | | | API: Add iid filter to milestonesRobert Schilling2016-04-123-3/+8
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'api-notes-date' into 'master' Rémy Coutable2016-04-123-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose updated_at for notes * Closes #7954 See merge request !3560
| * | | | | | | | | | | | | | | | | | | | | API: Expose updated_at for notesRobert Schilling2016-04-123-1/+5
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'api-labels-info' into 'master' Rémy Coutable2016-04-123-20/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238 See merge request !3569
| * | | | | | | | | | | | | | | | | | | | | Add changelog itemRobert Schilling2016-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | API: Expose open_issues_count, closed_issues_count, ↵Robert Schilling2016-04-062-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open_merge_requests_count on labels
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'issue_1752' into 'master' Robert Speicher2016-04-112-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone removal problem when editing issues fixes #1752 See merge request !3571
| * | | | | | | | | | | | | | | | | | | | | improve specs code syntaxissue_1752Felipe Artur2016-04-071-11/+11
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix milestone removal problem when editing issuesFelipe Artur2016-04-062-0/+16
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'banzai-metrics' into 'master' Robert Speicher2016-04-112-8/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument Banzai code See merge request !3659
| * | | | | | | | | | | | | | | | | | | | | Instrument Banzai codeYorick Peterse2016-04-112-8/+35
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |