summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master'Phil Hughes2018-08-102-4/+4
|\
| * Reduce differences between CE and EE code base in reports componentsFilipa Lacerda2018-08-102-4/+4
* | CE Port of Protected Environments backendMayra Cabrera2018-08-104-4/+22
* | Merge branch '48320-cancel-a-created-job' into 'master'Grzegorz Bizon2018-08-101-1/+1
|\ \
| * | Allows to cancel a Created jobJacopo2018-08-101-1/+1
| |/
* | Merge branch 'ce-port-3959-mirroring-interface-improvements' into 'master'Tim Zallmann2018-08-1012-75/+220
|\ \
| * | Fix missed portLuke Bennett2018-08-091-2/+2
| * | port changesLuke Bennett2018-08-073-6/+3
| * | Merge branch 'master' into 'ce-port-3959-mirroring-interface-improvements'Luke Bennett2018-08-06602-2000/+5540
| |\ \
| * | | Review changesLuke Bennett2018-08-032-7/+20
| * | | Move direction select to mirror_repos_formLuke Bennett2018-08-032-10/+5
| * | | Make Pull default directionLuke Bennett2018-08-031-2/+2
| * | | Fix direction select disabledLuke Bennett2018-08-022-2/+2
| * | | Fix settings.scssLuke Bennett2018-08-021-4/+0
| * | | Fix mirror_helper.rb EOF lineLuke Bennett2018-08-011-1/+1
| * | | Disable direction select if 1 optionLuke Bennett2018-08-021-1/+1
| * | | re-portLuke Bennett2018-08-0210-20/+55
| * | | port ProjectMirrorSerializerce-port-3959-mirroring-interface-improvementsLuke Bennett2018-07-251-0/+3
| * | | Remove debuggerLuke Bennett2018-07-251-2/+0
| * | | portLuke Bennett2018-07-2510-74/+182
* | | | Merge branch '28930-add-project-reference-filter' into 'master'Sean McGivern2018-08-101-0/+22
|\ \ \ \
| * | | | Add back the Project#to_reference_with_postfix function since it can be used ...Reuben Pereira2018-07-051-0/+4
| * | | | Remove the restriction preventing project references with text adjacent to th...Reuben Pereira2018-07-041-2/+0
| * | | | Remove the Project#to_reference_with_postfix method since it is only used in ...Reuben Pereira2018-07-031-4/+0
| * | | | Use literal '>' as escaped form of '>'Reuben Pereira2018-07-031-1/+5
| * | | | Correct the comment above the Project.markdown_reference_pattern methodReuben Pereira2018-07-031-2/+2
| * | | | Add a comment explaining the need to check for the escaped form of '>' when s...Reuben Pereira2018-06-301-0/+2
| * | | | A working implementation of a project reference filter which links project re...Reuben Pereira2018-06-301-0/+18
* | | | | Enable frozen string in rest of app/models/**/*.rbgfyoung2018-08-1055-14/+122
| |_|_|/ |/| | |
* | | | Merge branch '49375-move-reports-code' into 'master'Phil Hughes2018-08-0911-16/+14
|\ \ \ \
| * | | | Moves report components to reports folderFilipa Lacerda2018-08-0711-16/+14
* | | | | Add default avatar to groupGeorge Tsiolis2018-08-095-32/+34
* | | | | Merge branch 'ide-open-empty-merge-request' into 'master'Filipa Lacerda2018-08-092-4/+5
|\ \ \ \ \
| * | | | | removed un-used commits for currentProject & currentBranchIdPhil Hughes2018-08-091-3/+0
| * | | | | Allow the Web IDE to open empty merge requestsPhil Hughes2018-08-091-1/+5
* | | | | | Fix label item height when no descLuke Bennett2018-08-091-1/+2
* | | | | | Merge branch 'frozen-string-enable-app-models-even-more' into 'master'Stan Hu2018-08-08101-2/+205
|\ \ \ \ \ \
| * | | | | | Enable more frozen string in app/models/**/*.rbgfyoung2018-08-07101-2/+205
* | | | | | | Merge branch '35952-keep-project-repository-settings-open-after-submit' into ...Tim Zallmann2018-08-0812-19/+21
|\ \ \ \ \ \ \
| * | | | | | | ensure all project repository settings panels remain open after form submissionMike Greiling2018-08-0812-19/+21
* | | | | | | | Keep project settings sections expanded after submitting formMike Greiling2018-08-084-8/+12
* | | | | | | | Merge branch '35952-keep-group-settings-open-after-submit' into 'master'Tim Zallmann2018-08-083-1/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | ensure all group settings panels remain open after form submissionMike Greiling2018-08-083-1/+3
| |/ / / / / /
* | | | | | | Merge branch 'sh-fix-oauth-link-to-message' into 'master'Rémy Coutable2018-08-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix broken text in OAuth authorization screenStan Hu2018-08-071-1/+1
* | | | | | | | Porting MR Vue Memory Fixes to current masterTim Zallmann2018-08-0814-83/+195
* | | | | | | | Resolve "Group dashboard > Line height is too tall for group names"Adriel Santiago2018-08-073-55/+75
* | | | | | | | Merge branch '35952-keep-project-cicd-settings-open-after-submit' into 'master'Tim Zallmann2018-08-074-10/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | keep pipeline triggers settings panel open after form submissionMike Greiling2018-08-071-5/+5
| * | | | | | | | keep cicd runner settings panel open after form submissionMike Greiling2018-08-071-3/+3