summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routesAdam Niedzielski2017-04-103-34/+124
* Merge branch 'clean_carrierwave_tempfiles' into 'master'Rémy Coutable2017-04-104-5/+28
|\
| * Periodically clean up temporary upload files to recover storage spaceblackst0ne2017-04-104-5/+28
|/
* Merge branch 'refactor-behaviors' into 'master' Alfredo Sumaran2017-04-097-205/+185
|\
| * consolidate all behavior imports into an index.js filerefactor-behaviorsMike Greiling2017-04-042-8/+10
| * refactor and fix eslint violations in behaviors directoryMike Greiling2017-04-045-197/+175
* | Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-0924-40/+40
|\ \
| * | Remove the User#is_admin? methodblackst0ne2017-04-0924-40/+40
* | | Merge branch 'add-field-for-group-name' into 'master' Alfredo Sumaran2017-04-0912-23/+88
|\ \ \ | |/ / |/| |
| * | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-0912-23/+88
|/ /
* | Merge branch 'new-resolvable-discussion' into 'master' Douwe Maan2017-04-08140-2225/+4037
|\ \
| * \ Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0738-697/+881
| |\ \
| * | | Fix specsDouwe Maan2017-04-072-2/+2
| * | | alfredo review changesLuke "Jared" Bennett2017-04-071-1/+1
| * | | Revert yarn.lock changesLuke "Jared" Bennett2017-04-072-273/+2055
| * | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07123-480/+1883
| |\ \ \
| * | | | Rever yarn.lock changesLuke "Jared" Bennett2017-04-071-2075/+276
| * | | | Review changesLuke "Jared" Bennett2017-04-074-9/+34
| * | | | Fix firefox overflow css bugLuke "Jared" Bennett2017-04-071-0/+1
| * | | | Fix bug where commit comment would not show up in the right discussion on the...Douwe Maan2017-04-072-11/+11
| * | | | Fix creating discussion when diff view is set to parallelDouwe Maan2017-04-072-27/+20
| * | | | Fix view specDouwe Maan2017-04-071-2/+2
| * | | | Update schema.rbDouwe Maan2017-04-071-1/+1
| * | | | Add link to list itemsLuke "Jared" Bennett2017-04-072-15/+28
| * | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0767-309/+1225
| |\ \ \ \
| * | | | | Added variable button fixLuke "Jared" Bennett2017-04-073-20/+38
| * | | | | Fixed issue button state bugLuke "Jared" Bennett2017-04-075-80/+121
| * | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07229-1046/+1847
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into update-droplab-to-webpack-versionupdate-droplab-to-webpack-versionLuke "Jared" Bennett2017-04-07466-2918/+9189
| | |\ \ \ \ \
| * | | | | | | Fixed bugs and added testsLuke "Jared" Bennett2017-04-076-15/+33
| * | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-074-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Renamed spec filesLuke "Jared" Bennett2017-04-074-0/+0
| * | | | | | | Finish up feature specLuke "Jared" Bennett2017-04-074-65/+63
| * | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-062-10/+80
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Update inputsetterLuke "Jared" Bennett2017-04-062-10/+80
| * | | | | | | Further fixes for feature specLuke "Jared" Bennett2017-04-061-4/+6
| * | | | | | | Update schema.rb versionDouwe Maan2017-04-061-1/+1
| * | | | | | | Merge branch 'new-resolvable-discussion' of gitlab.com:gitlab-org/gitlab-ce i...Luke "Jared" Bennett2017-04-06272-1879/+7349
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-06272-1879/+7349
| | |\ \ \ \ \ \ \
| * | | | | | | | | Further fixes for feature specLuke "Jared" Bennett2017-04-061-25/+30
| |/ / / / / / / /
| * | | | | | | | Merge branch 'new-resolvable-discussion' of gitlab.com:gitlab-org/gitlab-ce i...Luke "Jared" Bennett2017-04-0618-69/+107
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Refactor resolvability checks based on typeDouwe Maan2017-04-0617-67/+107
| | * | | | | | | | Remove unnecesary styleAlfredo Sumaran2017-04-061-2/+0
| * | | | | | | | | Fix feature specs, still some to be doneLuke "Jared" Bennett2017-04-061-13/+21
| |/ / / / / / / /
| * | | | | | | | Add feature specsLuke "Jared" Bennett2017-04-062-4/+246
| * | | | | | | | Correct dropdown widthLuke "Jared" Bennett2017-04-061-1/+1
| * | | | | | | | Update unit testsLuke "Jared" Bennett2017-04-064-36/+81
| * | | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-06249-772/+2863
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fixed error handlingLuke "Jared" Bennett2017-04-065-15/+23
| | * | | | | | | Merge branch 'master' into update-droplab-to-webpack-versionLuke "Jared" Bennett2017-04-06244-757/+2842
| | |\ \ \ \ \ \ \