summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-03-212771-20505/+25386
|\
| * Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' Kamil Trzciński2017-03-211-0/+1
| |\
| | * Fix pipeline status for transition between stagesGrzegorz Bizon2017-03-201-0/+1
| * | Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo...Sean McGivern2017-03-212-8/+7
| |\ \
| | * | Fix ProjectWiki#http_url_to_repo signatureRémy Coutable2017-03-202-8/+7
| * | | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-0/+9
| |\ \ \
| | * | | Undo explicit conversion to IntegerToon Claes2017-03-201-12/+0
| | * | | Fix Error 500 when application settings are savedStan Hu2017-03-182-0/+21
| * | | | Merge branch 'add-filter-focus-style' into 'master' Alfredo Sumaran2017-03-212-4/+40
| |\ \ \ \
| | * | | | Fix karma testClement Ho2017-03-201-3/+2
| | * | | | Add additional check for when inputContainer does not existClement Ho2017-03-201-1/+5
| | * | | | Add filter focus for filtered search visual tokensClement Ho2017-03-172-4/+37
| * | | | | Merge branch 'bugfix/systemhook' into 'master' Douwe Maan2017-03-211-5/+4
| |\ \ \ \ \
| | * | | | | Fix bug when system hook for deploy keybilly.lb2017-03-161-5/+4
| * | | | | | Merge branch 'rs-issue-29592' into 'master' Stan Hu2017-03-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | Handle Route#name being nil after an updateRobert Speicher2017-03-201-1/+1
| * | | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-2037-41/+57
| |\ \ \ \ \ \ \
| | * | | | | | | Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-202-2/+2
| | * | | | | | | Merge branch 'ssrf' into 'security' Douwe Maan2017-03-203-1/+14
| | * | | | | | | Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-2028-34/+35
| | * | | | | | | Merge branch '28058-hide-emails-in-atom-feeds' into 'security'Rémy Coutable2017-03-204-4/+6
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'clear-page-param-after-filter-in-add-issues-modal' into 'master' Alfredo Sumaran2017-03-211-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Reset issue boards add issues modal page when filteringclear-page-param-after-filter-in-add-issues-modalPhil Hughes2017-03-171-0/+4
| * | | | | | | | Merge branch 'token-bug-fixes' into 'master'Clement Ho2017-03-201-2/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update css to be nice and tidy.Jacob Schatz2017-03-201-2/+1
| * | | | | | | | | Reset filters after clickClement Ho2017-03-201-1/+2
| * | | | | | | | | Merge branch '28499-fix-large-text-tooltip-in-diff-file-name' into 'master' Filipa Lacerda2017-03-201-0/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fixes large text tooltip in diff file nameNur Rony2017-03-201-0/+6
| * | | | | | | | | | Merge branch '28660-fix-dismissable-error-close-not-visible-enough' into 'mas...Filipa Lacerda2017-03-201-0/+12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | dismissable error close is not visible enough28660-fix-dismissable-error-close-not-visible-enoughNur Rony2017-03-021-0/+12
| * | | | | | | | | | | Merge branch '29559-issue-count' into 'master' Filipa Lacerda2017-03-201-3/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | handle commas in Issue total countSimon Knox2017-03-211-3/+5
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'fix-input-token-spacing' into 'master' Annabel Dunstone Gray2017-03-201-4/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix input token spacingClement Ho2017-03-201-4/+6
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Removed d3.js from the main application.js bundleJose Ivan Vargas Lopez2017-03-204-20/+26
| * | | | | | | | | | | Merge branch 'issue-filter-bar-alignment' into 'master' Annabel Dunstone Gray2017-03-202-3/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed mobile alignment issuesPhil Hughes2017-03-171-2/+2
| | * | | | | | | | | | | Fixed filter bar alignment issuesPhil Hughes2017-03-172-1/+6
| * | | | | | | | | | | | Merge branch '20204-new-issue-button-redirects-you-to-create-a-new-issue-afte...Sean McGivern2017-03-204-42/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Redirect to signin when New Issue for not logged inSam Rose2017-03-204-42/+39
| * | | | | | | | | | | | Merge branch 'issue_27212' into 'master' Sean McGivern2017-03-201-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Add closed_at field to issuesFelipe Artur2017-03-171-0/+8
| * | | | | | | | | | | | Merge branch 'routes-lower-case' into 'master' Yorick Peterse2017-03-201-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Remove repeated routes.path check for postgresql databasemhasbini2017-03-181-4/+6
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix Project Wiki updateDongqing Hu2017-03-203-4/+8
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-204-8/+21
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Todos performance: Include associations in FinderJarka Kadlecova2017-03-204-8/+21
| * | | | | | | | | | | Merge branch 'fix/regressions-in-ci-v4-api' into 'master' Kamil Trzciński2017-03-201-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Simplify Ci::Build#dependencies methodTomasz Maczukin2017-03-201-8/+3
| | * | | | | | | | | | Send only defined dependenciesTomasz Maczukin2017-03-201-0/+15
| | |/ / / / / / / / /