summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej-note-search-uses-finder' into 'security'Douwe Maan2016-12-142-4/+2
* Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Douwe Maan2016-12-071-1/+1
* Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security'Douwe Maan2016-11-241-1/+1
* Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-151-0/+2
* Merge branch '22271-drone-tag-pipeline-build' into 'master'Douwe Maan2016-11-041-1/+1
* Merge branch 'issue_23242' into 'master'Sean McGivern2016-11-041-0/+8
* Merge branch '23403-fix-events-for-private-project-features' into 'security' Robert Speicher2016-11-041-25/+49
* Merge branch 'fix-unathorized-cloning' into 'security' Douwe Maan2016-11-041-31/+60
* Fixed Import/Export foreign key issue to do with project membersJames Lopez2016-11-013-12/+29
* Removes any symlinks before importing a project export file. Also added relev...James Lopez2016-11-013-3/+24
* Merge branch 'adam-fix-labels-find-or-create' into 'master'Douwe Maan2016-10-314-7/+7
* Merge branch 'fix/make-github-import-retryable' into 'master'Sean McGivern2016-10-318-23/+112
* Merge branch 'fix/gh-import-bugs' into 'master'Sean McGivern2016-10-312-13/+23
* Merge branch 'project-cache-worker-scheduling' into 'master'Rémy Coutable2016-10-251-1/+8
* Merge branch 'sh-fix-broken-label-controller' into 'master'Rémy Coutable2016-10-251-1/+1
* Merge branch 'preserve-note_type-and-position' into 'master' Sean McGivern2016-10-211-1/+3
* Merge branch '22191-delete-dynamic-envs-mr' into 'master'Rémy Coutable2016-10-201-2/+16
* Merge branch 'feature/group-level-labels' into 'master'Douwe Maan2016-10-2011-52/+98
* Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-201-0/+49
* Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' Sean McGivern2016-10-182-5/+9
|\
| * Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-172-5/+9
* | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-2/+2
|\ \ | |/
| * Merge branch 'fix/reassign-secret-token-on-generate' into 'master' Douwe Maan2016-10-141-2/+2
| |\
| | * Reassign secret token when regenerating onefix/reassign-secret-token-on-generateGrzegorz Bizon2016-10-131-2/+2
* | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+5
* | | Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
* | | Allow setting content for resolutionsSean McGivern2016-10-134-13/+63
|/ /
* | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-131-2/+5
* | Convert unicode emojis to images.henrik2016-10-111-1/+6
|/
* Merge branch 'explain-0600' into 'master' Robert Speicher2016-10-101-1/+1
|\
| * Explain the extra chmodJacob Vosmaer2016-09-261-1/+1
* | Correct namespace validation to forbid bad names #21077Will Starms2016-10-071-2/+2
* | Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-061-15/+31
* | Merge branch 'fix/github-importer-client' into 'master' Rémy Coutable2016-10-061-2/+12
|\ \
| * | Fix broken handling of certain calls in GitHub importer clientfix/github-importer-clientAhmad Sherif2016-10-061-2/+12
* | | Use higher size on Gitlab::Redis connection pool on Sidekiq serversPaco Guzman2016-10-061-1/+11
* | | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-063-5/+25
|\ \ \
| * \ \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-303-5/+25
| |\ \ \
| | * | | updated attribute cleaner to use allowed keyword and reject attributesJames Lopez2016-09-271-3/+3
| | * | | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-273-5/+25
| | | |/ | | |/|
* | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-067-7/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix export project file permissions issueJames Lopez2016-09-307-7/+18
| | |/ | |/|
* | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-051-8/+50
|\ \ \
| * | | Refactor Gitlab::IdentifierYorick Peterse2016-10-051-8/+50
* | | | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-042-13/+25
|/ / /
* | | Merge branch 'aiionx_sidekiq_log_patch' into 'master' Rémy Coutable2016-10-031-1/+1
|\ \ \
| * | | aiionx_sidekiq_log_patchDavid2016-04-151-1/+1
* | | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-021-0/+4
|\ \ \ \
| * | | | Allow Member.add_user to handle access requestersRémy Coutable2016-09-281-0/+4
* | | | | Merge branch 'initialize-redis' into 'master' Yorick Peterse2016-09-301-18/+6
|\ \ \ \ \
View Lorry Controller Status