summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js-i18n-m' into 'master'60916-list-vanilla-js-i18n-offences-which-were-not-auto-fixedKushal Pandya2019-05-155-13/+18
|\
| * I18N JS files starting with mjs-i18n-mBrandon Labuschagne2019-05-035-13/+18
* | Merge branch 'ce-jej/sso-enforcement-redirect' into 'master'Rémy Coutable2019-05-156-21/+24
|\ \
| * | Avoid passing not_found_or_authorized_proc aroundJames Edwards-Jones2019-05-156-21/+18
| * | Refactor RoutableActions to allow for additional checksJames Edwards-Jones2019-05-151-3/+9
* | | Merge branch 'new-proj-member-scb' into 'master'Phil Hughes2019-05-152-1/+6
|\ \ \
| * | | Resolve CE/EE diffs in new proj member importnew-proj-member-scbLuke Bennett2019-05-102-1/+6
* | | | Merge branch 'proj-branches-index-scb' into 'master'Phil Hughes2019-05-151-0/+3
|\ \ \ \
| * | | | Resolve CE/EE diffs in project branchesproj-branches-index-scbLuke Bennett2019-05-111-0/+3
* | | | | Merge branch 'layouts-scb' into 'master'Phil Hughes2019-05-1515-4/+40
|\ \ \ \ \
| * | | | | Resolve CE/EE diffs in app/views/layouts viewlayouts-scbLuke Bennett2019-05-1115-4/+40
| |/ / / /
* | | | | Merge branch 'health-check-scb' into 'master'Phil Hughes2019-05-151-1/+1
|\ \ \ \ \
| * | | | | Resolve CE/EE diffs in health checkhealth-check-scbLuke Bennett2019-05-111-1/+1
| |/ / / /
* | | | | Merge branch '57239-remove-unused-h3-w3-classes' into 'master'Phil Hughes2019-05-151-4/+0
|\ \ \ \ \
| * | | | | Remove unused h-3 and w-3 classes57239-remove-unused-h3-w3-classesPaul Slaughter2019-05-131-4/+0
* | | | | | Merge branch 'clone-panel-scb' into 'master'Phil Hughes2019-05-151-0/+5
|\ \ \ \ \ \
| * | | | | | Resolve CE/EE diffs in _clone_panelclone-panel-scbLuke Bennett2019-05-141-0/+5
* | | | | | | Merge branch 'zero-auth-proj-scb' into 'master'Phil Hughes2019-05-152-5/+14
|\ \ \ \ \ \ \
| * | | | | | | Resolve CE/EE diffs in zero_authorized_projectszero-auth-proj-scbLuke Bennett2019-05-112-5/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'tabs-ldap-scb' into 'master'Phil Hughes2019-05-151-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Resolve CE/EE diffs in devise ldap tabstabs-ldap-scbLuke Bennett2019-05-101-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'next-badge-link' into 'master'Kushal Pandya2019-05-152-2/+19
|\ \ \ \ \ \ \
| * | | | | | | Remove trailing whitespace for lintnext-badge-linkMarcel van Remmerden2019-05-131-1/+1
| * | | | | | | Finish rebase processMarcel van Remmerden2019-05-131-0/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Resolve merge conflictMarcel van Remmerden2019-05-071-3/+4
| | * | | | | | | Change sizes from px to variablesMarcel van Remmerden2019-05-071-4/+4
| | * | | | | | | Refactor badge with link layoutMarcel van Remmerden2019-05-072-22/+18
| | * | | | | | | Adapt code to style guidelinesMarcel van Remmerden2019-05-072-9/+9
| | * | | | | | | Remove trailing whitespacesMarcel van Remmerden2019-05-071-4/+3
| | * | | | | | | Remove whitespaceMarcel van Remmerden2019-05-071-2/+2
| | * | | | | | | Fix new linesMarcel van Remmerden2019-05-071-1/+7
| | * | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-072-2/+18
| * | | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-131-3/+4
* | | | | | | | | Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-coreStan Hu2019-05-145-4/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Optimise upload path callsSean McGivern2019-05-145-4/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-project-visibility-level-validation' into 'master'Stan Hu2019-05-141-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix project visibility level validationPeter Marko2019-05-141-2/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '55583-rename-method-conflicts' into 'master'Jan Provaznik2019-05-149-42/+42
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Rename methods that conflict in Rails 5.255583-rename-method-conflictsHeinrich Lee Yu2019-05-129-42/+42
| |/ / / / / /
* | | | | | | Merge branch '61302-remove-ignore_column-ci_cd' into 'master'Douglas Barbosa Alexandre2019-05-131-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove ignore_column from Project model61302-remove-ignore_column-ci_cdDmitriy Zaporozhets2019-05-101-1/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ce-11542-remove-non-semantic-use-of-row-in-member-listing-contr...Kushal Pandya2019-05-131-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove non-semantic use of `.row` in member listing controlsce-11542-remove-non-semantic-use-of-row-in-member-listing-controlsDennis Tang2019-05-081-1/+1
* | | | | | | Merge branch 'qa-ml-fix-branches-test' into 'master'Sanad Liaquat2019-05-131-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add branch_name qa selectorqa-ml-fix-branches-testMark Lapierre2019-05-071-1/+1
* | | | | | | Fixes next badge being always visible61550-next-badgeFilipa Lacerda2019-05-101-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'sh-fix-lfs-download-errors' into 'master'Douglas Barbosa Alexandre2019-05-101-1/+11
|\ \ \ \ \ \
| * | | | | | Properly handle LFS Batch API response in project importsh-fix-lfs-download-errorsStan Hu2019-05-091-1/+11
* | | | | | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs2019-05-101-0/+1
* | | | | | | Don't run full gc in AfterImportServicesh-revert-full-gc-after-importStan Hu2019-05-101-1/+1
| |_|_|/ / / |/| | | | |
View Lorry Controller Status