summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Move parallel diff logic to separate classDouwe Maan2016-01-204-109/+5
* Check if MR is not broken.Rubén Dávila2016-01-191-1/+1
* Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-193-6/+10
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-14345-1983/+2586
|\
| * Merge branch 'ci/api-triggers' into 'master' Kamil Trzciński2016-01-141-0/+4
| |\
| | * Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-14122-908/+808
| | |\
| | * \ Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1412-10/+28
| | |\ \
| | * \ \ Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1424-106/+224
| | |\ \ \
| | * \ \ \ Merge branch '8-4-stable' into ci/api-triggersTomasz Maczukin2016-01-14229-884/+1391
| | |\ \ \ \
| | * | | | | Add some fixes after reviewTomasz Maczukin2016-01-131-0/+4
| * | | | | | Merge branch 'fixes-new-layout' into 'master' Dmitriy Zaporozhets2016-01-142-35/+39
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | add missing padding for commit -> builds pageDmitriy Zaporozhets2016-01-141-1/+2
| | * | | | | Fix layout for empty projectDmitriy Zaporozhets2016-01-141-34/+37
| * | | | | | fixes margin and paddingJacob Schatz2016-01-141-1/+1
| |/ / / / /
| * | | | | Merge branch 'backport-ee' into 'master' Robert Speicher2016-01-141-1/+1
| |\ \ \ \ \
| | * | | | | Param should be present, not just truthybackport-eeDouwe Maan2016-01-141-1/+1
| * | | | | | Merge branch 'rs-fix-cross-reference' into 'master' Robert Speicher2016-01-142-3/+9
| |\ \ \ \ \ \
| | * | | | | | centering copy buttonrs-fix-cross-referenceJacob Schatz2016-01-131-0/+1
| | * | | | | | Fix cross-project reference clipboard textRobert Speicher2016-01-132-4/+9
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'ui-fixes' into 'master' Dmitriy Zaporozhets2016-01-149-112/+60
| |\ \ \ \ \ \
| | * | | | | | Fix css mess around git clone panel. Align it properlyDmitriy Zaporozhets2016-01-145-104/+60
| | * | | | | | Fix missing padding for user/group pagesDmitriy Zaporozhets2016-01-144-8/+0
| * | | | | | | Merge branch 'ci/api-builds' into 'master' Douwe Maan2016-01-141-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-buildsTomasz Maczukin2016-01-142-4/+2
| | * | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1436-116/+252
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1343-79/+153
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-11163-532/+1029
| | |\ \ \ \ \ \
| | * | | | | | | Modify builds scope filtering in builds APITomasz Maczukin2016-01-081-0/+4
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-1413-106/+131
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-145-21/+23
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Move js function to removing accents to vendor/assets/javascriptsDouglas Barbosa Alexandre2016-01-141-7/+3
| | | * | | | | | | | Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-141-1/+1
| | | * | | | | | | | Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTMLDouglas Barbosa Alexandre2016-01-141-0/+4
| | | * | | | | | | | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-143-20/+22
| | * | | | | | | | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-148-85/+108
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | #can_unsubscribe? -> #?unsubscribable?Zeger-Jan van de Weg2016-01-113-3/+3
| | | * | | | | | | | | Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-092-6/+6
| | | * | | | | | | | | Add #can_unsubscribe? to SentNotificationZeger-Jan van de Weg2016-01-092-1/+5
| | | * | | | | | | | | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-098-84/+103
| * | | | | | | | | | | Merge remote-tracking branch 'origin/rs-autosize'Dmitriy Zaporozhets2016-01-145-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix missing autosize requirers-autosizeRobert Speicher2016-01-131-0/+1
| | * | | | | | | | | | Autosize textareasRobert Speicher2016-01-135-1/+8
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'new-buttons-everywhere' into 'master' Dmitriy Zaporozhets2016-01-1410-83/+61
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Standartize buttons and fields sizeDmitriy Zaporozhets2016-01-1410-83/+61
| * | | | | | | | | | Merge branch 'closing-mr-bug-fix' into 'master' Dmitriy Zaporozhets2016-01-142-6/+11
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fixes bug with commenting on merge requestsclosing-mr-bug-fixJacob Schatz2016-01-132-6/+11
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-1483-565/+397
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add margin to pages where is no headerremove-gray-bgDmitriy Zaporozhets2016-01-144-4/+4
| | * | | | | | | | | Update files/diffs to match new layoutDmitriy Zaporozhets2016-01-1412-17/+26
| | * | | | | | | | | Fix files, project settings and few more pages with new layoutDmitriy Zaporozhets2016-01-147-7/+18
View Lorry Controller Status