summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Move awards back to gray panel and few improvements to sidebarDmitriy Zaporozhets2015-12-117-6/+7
* Few UI improvements to new sidebar implementationDmitriy Zaporozhets2015-12-113-8/+13
* Fix tests for new issuable sidebarDmitriy Zaporozhets2015-12-111-7/+10
* Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-1110-92/+82
* Make edit link on issuable sidebar worksDmitriy Zaporozhets2015-12-111-2/+8
* Redesign issue page for new sidebarDmitriy Zaporozhets2015-12-116-198/+97
* Move awards css to separate fileDmitriy Zaporozhets2015-12-111-0/+68
* Implement issuable sidebar partialDmitriy Zaporozhets2015-12-111-0/+80
* Merge branch 'mr-statuses' into 'master' Robert Speicher2015-12-116-1/+59
|\
| * display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-116-1/+59
* | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'Robert Speicher2015-12-111-8/+16
|\ \ | |/ |/|
| * Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-101-8/+16
* | Merge branch 'feature/project_js_from_ee' into 'master' Douwe Maan2015-12-111-2/+5
|\ \
| * | Aling project js with EEBorja Aparicio2015-12-101-2/+5
* | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-114-105/+39
|\ \ \
| * | | Fix specs by adding forgotten instance variableGrzegorz Bizon2015-12-081-0/+3
| * | | Remove obsolete variables in `repository_push_email`Grzegorz Bizon2015-12-083-45/+32
| * | | Improve Messagee::RepositoryPushGrzegorz Bizon2015-12-081-3/+3
| * | | Refactor RepositoryPush, move to Message namespaceGrzegorz Bizon2015-12-081-18/+20
| * | | Make `can_send_from_user_email?` public in NotifyGrzegorz Bizon2015-12-081-2/+2
| * | | Extract repository_push_email to separate classGrzegorz Bizon2015-12-081-77/+19
* | | | Fix award-emojis alert flash messageGrzegorz Bizon2015-12-113-13/+3
* | | | emoji aliases problemValery Sizov2015-12-113-3/+10
* | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-111-2/+18
|\ \ \ \
| * \ \ \ Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-10462-3492/+5768
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Licence also accepted as license fileZeger-Jan van de Weg2015-12-101-7/+15
| * | | | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-11376-2354/+3977
| |\ \ \ \
| * | | | | Add specs on #licenseZeger-Jan van de Weg2015-10-151-1/+5
| * | | | | Prefer Licence over CopyingZeger-Jan van de Weg2015-10-141-3/+7
| * | | | | COPYING is now also accepted as licence fileZeger-Jan van de Weg2015-10-141-3/+3
* | | | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' Dmitriy Zaporozhets2015-12-111-1/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove check icon from merged requestsremove_check_icon_from_mr_pageAchilleas Pipinellis2015-12-101-1/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu...Dmitriy Zaporozhets2015-12-101-2/+4
|\ \ \ \ \
| * | | | | Provide better diagnostic message upon project creation errorsStan Hu2015-12-091-2/+4
* | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-102-8/+13
|\ \ \ \ \ \
| * | | | | | Make selectors more specific when scroll to elementDouglas Barbosa Alexandre2015-12-101-1/+1
| * | | | | | Make selectors more specific when setting the tab contentDouglas Barbosa Alexandre2015-12-101-3/+3
| * | | | | | USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-3/+2
| * | | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-095-20/+26
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Ensure new notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-3/+7
| * | | | | | Ensure existing notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-1/+3
| * | | | | | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-091-1/+1
* | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow'Dmitriy Zaporozhets2015-12-101-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Don't allow to edit award emoji commentsemoji_edit_disallowValery Sizov2015-12-101-1/+1
* | | | | | | Merge branch 'tmp-reference-pipeline-and-caching' into 'master' Douwe Maan2015-12-1021-72/+68
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-1063-326/+696
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-0821-72/+68
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0828-91/+242
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-07165-912/+1270
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0375-299/+291
| | |\ \ \ \ \ \ \ \ \
View Lorry Controller Status