summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'add-svg-loader'Filipa Lacerda2017-02-2737-386/+467
|\
| * Merge branch 'ssh-key-paste' into 'master' Filipa Lacerda2017-02-271-3/+4
| |\
| | * Updates SSH key title after pasting keyPhil Hughes2017-02-271-3/+4
| * | Merge branch 'mock-ci-service' into 'master'Douwe Maan2017-02-273-1/+87
| |\ \
| | * | Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-243-1/+87
| * | | Merge branch 'rss-btn-alignment-fix' into 'master' Annabel Dunstone Gray2017-02-275-12/+4
| |\ \ \
| | * | | Fixed alignment of RSS button on activity pagesrss-btn-alignment-fixPhil Hughes2017-02-235-12/+4
| * | | | Merge branch 'mr-diff-comment-button' into 'master' Annabel Dunstone Gray2017-02-278-68/+125
| |\ \ \ \
| | * | | | Removed link transitionmr-diff-comment-buttonPhil Hughes2017-02-276-5/+14
| | * | | | Changed dark hover backgroundPhil Hughes2017-02-271-1/+1
| | * | | | Moved color values into variablesPhil Hughes2017-02-275-15/+20
| | * | | | Grow the button on hoverPhil Hughes2017-02-272-15/+15
| | * | | | Improved the diff comment button UXPhil Hughes2017-02-278-59/+102
| * | | | | Merge branch 'ci-tables-ui-improvements' into 'master' Annabel Dunstone Gray2017-02-274-267/+114
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvementsFilipa Lacerda2017-02-27158-1274/+1715
| | |\ \ \ \ \
| | * | | | | | Guarantees we show at least 4 stages in line in smaller screensFilipa Lacerda2017-02-231-0/+1
| | * | | | | | Aligns text content instead of divFilipa Lacerda2017-02-232-106/+82
| | * | | | | | Merge branch 'master' into ci-tables-ui-improvementsFilipa Lacerda2017-02-2354-553/+668
| | |\ \ \ \ \ \
| | * | | | | | | Guarantees buttons will always stay in the same lineFilipa Lacerda2017-02-231-1/+2
| | * | | | | | | Fix btn group not having round corners when there's only some buttons presentFilipa Lacerda2017-02-231-19/+10
| | * | | | | | | Equal padding between table cellsFilipa Lacerda2017-02-222-51/+22
| | * | | | | | | Fix scss linter errorFilipa Lacerda2017-02-221-2/+2
| | * | | | | | | Improvements in spacingFilipa Lacerda2017-02-221-4/+7
| | * | | | | | | Remove unused fileFilipa Lacerda2017-02-221-92/+0
| | * | | | | | | Remove unused css, align buttons with top buttonFilipa Lacerda2017-02-221-21/+15
| | * | | | | | | Convert button into a btn group according to mockupsFilipa Lacerda2017-02-221-29/+32
| * | | | | | | | Merge branch '14748-runner-version-in-admin-views' into 'master' Rémy Coutable2017-02-272-0/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add runner version to /admin/runners viewJonathon Reinhart2017-02-262-0/+3
| * | | | | | | | | Merge branch 'sh-async-delete-children' into 'master' Dmitriy Zaporozhets2017-02-271-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make nested groups deletion synchronous to avoid potential raceStan Hu2017-02-271-1/+2
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-274-14/+41
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-244-14/+41
| * | | | | | | | | | Merge branch 'improve-backoff-algo' into 'master' Fatih Acet2017-02-271-3/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Improves backoff algo with maxInterval between requestsFilipa Lacerda2017-02-271-3/+4
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '28721-backport-http-status-code-ee' into 'master' Jacob Schatz2017-02-271-0/+10
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Backport EE http status codes new file to CEFilipa Lacerda2017-02-271-0/+10
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-273-4/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-243-4/+10
| * | | | | | | | | | Merge branch '27267-events-project-query-performance-regression' into 'master' Sean McGivern2017-02-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add performance query regression fix for !9088 affecting #2726727267-events-project-query-performance-regressionOswaldo Ferreira2017-02-241-1/+1
| * | | | | | | | | | Merge branch 'backoff-algo-backport-ee' into 'master' Jacob Schatz2017-02-261-0/+52
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Adds backoff algo from EE to CEbackoff-algo-backport-eeFilipa Lacerda2017-02-241-0/+52
| * | | | | | | | | | Merge branch 'pedro-mattermost-slack-notifications-text' into 'master' Kamil Trzciński2017-02-262-14/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add clearer placeholders and channel definition.Pedro Moreira da Silva2017-02-242-14/+14
| * | | | | | | | | | | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | * | | | | | | | | | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-3/+1
* | | | | | | | | | | | Changes after review - adds alias for icons pathFilipa Lacerda2017-02-277-23/+23
* | | | | | | | | | | | Fix eslint errorFilipa Lacerda2017-02-251-1/+0
* | | | | | | | | | | | Merge branch 'master' into 'add-svg-loader'Filipa Lacerda2017-02-2520-223/+380
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-246-193/+68
| |\ \ \ \ \ \ \ \ \ \ \