summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-111-2/+1
|\
| * Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prepAlejandro Rodríguez2017-12-061-2/+1
* | Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-119-58/+121
|\ \
| * | Backport epic in issueepic-in-issuebackport-epic-in-issueClement Ho2017-12-079-58/+121
* | | Merge branch 'url-utility-es-module' into 'master'Filipa Lacerda2017-12-1131-125/+120
|\ \ \
| * | | updated importsurl-utility-es-modulePhil Hughes2017-12-1114-29/+29
| * | | Merge branch 'master' into 'url-utility-es-module'Phil Hughes2017-12-1136-249/+581
| |\ \ \
| * | | | fixed URL being undefined :face_palm:Phil Hughes2017-12-081-2/+2
| * | | | use exported methods instead of gl.utilsPhil Hughes2017-12-0831-68/+74
| * | | | Moved URL utility methods into es modulesPhil Hughes2017-12-081-69/+58
* | | | | Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-1110-31/+36
|\ \ \ \ \
| * | | | | Fix transitions35724-animate-sidebarAnnabel Dunstone Gray2017-12-071-12/+9
| * | | | | Fix mobile stylesAnnabel Dunstone Gray2017-12-072-18/+10
| * | | | | Animate contextual sidebar; change class names for easier readabilityAnnabel Dunstone Gray2017-12-0711-33/+49
* | | | | | Merge branch 'remove_assignee_id' into 'master'Yorick Peterse2017-12-111-0/+3
|\ \ \ \ \ \
| * | | | | | Add spec for removing issues.assignee_idSean McGivern2017-12-111-0/+3
* | | | | | | Merge branch '40743-bug-accepting-new-group-members-when-permission-level-dev...Douwe Maan2017-12-112-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Bugfix: User can't change the access level of an access requesterRubén Dávila2017-12-112-2/+2
* | | | | | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-114-7/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| * | | | | | | Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-081-1/+2
| * | | | | | | Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-081-0/+27
| * | | | | | | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ...Douwe Maan2017-12-082-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-111-2/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
| |/ / / / /
* | | | | | Merge branch 'bw-todo-count-expiration' into 'master'Sean McGivern2017-12-111-2/+2
|\ \ \ \ \ \
| * | | | | | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
* | | | | | | Fix image view modeClement Ho2017-12-111-2/+2
* | | | | | | Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | revert arrow function changees-module-compareMike Greiling2017-11-301-1/+1
| * | | | | | convert CompareAutocomplete from class definition into simple function call, ...Mike Greiling2017-11-303-65/+56
| * | | | | | convert Compare class into ES module import/export syntaxMike Greiling2017-11-303-4/+3
| * | | | | | refactor Compare class to ES class syntaxMike Greiling2017-11-301-18/+16
| * | | | | | remove commits.js import form main.js (related to !14735)Mike Greiling2017-11-301-1/+0
* | | | | | | Allow git pull/push on project redirectsMayra Cabrera2017-12-083-5/+60
* | | | | | | Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-088-35/+148
|\ \ \ \ \ \ \
| * | | | | | | Reduce the size of the deploy flag when there's no tag available38032-deploy-markers-should-be-more-verboseJose Ivan Vargas2017-12-071-3/+11
| * | | | | | | Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-078-35/+140
* | | | | | | | Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-081-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-081-12/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Implement and use Gitlab::Ci::Pipeline::Chain::CommandKamil Trzcinski2017-12-081-12/+13
* | | | | | | | | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-0811-63/+249
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-086-42/+26
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-083-5/+27
|\ \ \ \ \ \ \
| * | | | | | | Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-073-5/+27
* | | | | | | | Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-079-13/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-079-13/+27
* | | | | | | | | Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-host...Jacob Schatz2017-12-071-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace absolute URLs on related branches/MRs with relative url to avoid host...40555-replace-absolute-urls-with-related-branches-to-avoid-hostnameEric Eastwood2017-12-041-2/+2
| | |/ / / / / / / | |/| | | | | | |