summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bugfix/html-email-brackets' into 'master'Douwe Maan2017-06-201-0/+7
|\
| * unwrap all links with no hrefhttp://jneen.net/2017-06-191-0/+7
* | Merge branch '28517-discover-by-userid' into 'master'Douwe Maan2017-06-201-3/+8
|\ \
| * | Allow discover by userid - issue 28517Matt Walsh2017-06-201-3/+8
* | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-201-12/+14
|\ \ \
| * | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-12/+14
* | | | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-202-3/+6
| |/ / |/| |
* | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-1/+15
|\ \ \
| * | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
| * | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-1/+12
* | | | Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-192-20/+53
|\ \ \ \ | |_|_|/ |/| | |
| * | | If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settingsStan Hu2017-06-192-22/+54
| * | | Revert "Merge branch 'rs-revert-11842' into 'master'"Stan Hu2017-06-191-1/+2
* | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-192-20/+20
|\ \ \ \
| * | | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-192-20/+20
* | | | | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-192-37/+92
|\ \ \ \ \
| * | | | | repository: index submodules by pathDavid Turner2017-06-162-37/+92
* | | | | | Merge branch 'update-column-in-batches-batch-size' into 'master'Rémy Coutable2017-06-191-0/+6
|\ \ \ \ \ \
| * | | | | | Put an upper limit on update batchesupdate-column-in-batches-batch-sizeYorick Peterse2017-06-191-0/+6
* | | | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-191-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-194-10/+41
|\ \ \ \ \ \
| * | | | | | 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 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 APIvanadium232017-06-161-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'issue_33205' into 'master'Sean McGivern2017-06-191-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix API bug accepting wrong merge requests parametersissue_33205Felipe Artur2017-06-161-1/+1
* | | | | | Partially revert 1e8dbd46Robert Speicher2017-06-161-2/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-167-13/+40
|\ \ \ \ \
| * | | | | Add table for files in merge request diffsSean McGivern2017-06-167-13/+40
* | | | | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-18/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
| |/ / / /
* | | | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-1622-41/+41
|\ \ \ \ \
| * | | | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-1522-41/+41
| |/ / / /
* | | | | 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 messagesAlejandro Rodríguez2017-06-142-11/+10
* | | | | #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 cachedm-fix-parser-cacheDouwe Maan2017-06-141-1/+1
* | | | | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-142-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Help landing page customizationsRobin Bobbitt2017-06-142-0/+7
| | |/ / | |/| |
* | | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-143-2/+111
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 serviceNick Thomas2017-06-141-6/+6
View Lorry Controller Status