summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update font-awesome-rails to 4.7.0.119062-relax-font-awesome-railsRémy Coutable2017-03-071-1/+1
* Relax font-awesome-rails dependency to ~> 4.7Rémy Coutable2017-03-072-2/+2
* Merge branch '28538-restore-nav-shortcuts' into 'master' Alfredo Sumaran2017-03-0610-9/+108
|\
| * Restore keyboard shortcuts for "Activity" and "Charts"Kushal Pandya2017-03-0610-9/+108
|/
* Merge branch 'rs-carrierwave-db' into 'master' Douwe Maan2017-03-0629-19/+528
|\
| * Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-0625-12/+446
| |\
| * | Add `uploads` to known models for Import/Export specRobert Speicher2017-03-061-0/+1
| * | Add `has_many` associations for models that can have Upload recordsRobert Speicher2017-03-068-0/+9
| * | Handle relative and absolute Upload paths in the UploadersRobert Speicher2017-03-065-10/+70
| * | Change the default CarrierWave root path for testsRobert Speicher2017-03-061-1/+1
| * | Fix Projects::UploadService specRobert Speicher2017-03-061-7/+7
| * | Add a Project::UploadsController spec to ensure an Upload is createdRobert Speicher2017-03-061-0/+13
| * | Add `RecordsUploads` module to record Upload records via callbacksRobert Speicher2017-03-067-6/+151
| * | Add Upload model and UploadChecksumWorker workerRobert Speicher2017-03-068-2/+282
| * | Update carrierwave 0.10.0 -> 0.11.2Robert Speicher2017-03-062-3/+4
* | | Merge branch 'remove-subscribe-label-tooltip' into 'master' Alfredo Sumaran2017-03-062-2/+6
|\ \ \
| * | | Remove tooltips and titles from label subscription buttonsremove-subscribe-label-tooltipAnnabel Dunstone Gray2017-03-032-2/+6
* | | | Merge branch 'update-new-ip-pages-docs' into 'master' Achilleas Pipinellis2017-03-064-4/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Docs: update GL Pages IP on GL.comMarcia Ramos2017-03-064-4/+6
|/ / /
* | | Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-0625-12/+446
|\ \ \ | |_|/ |/| |
| * | Fix JS linting errorzj-create-mattermost-teamZ.J. van de Weg2017-03-061-1/+1
| * | Clean up specZ.J. van de Weg2017-03-061-3/+1
| * | Fix no out element caseZ.J. van de Weg2017-03-061-0/+3
| * | Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-0675-298/+1208
| |\ \
| * | | Fix eslintZ.J. van de Weg2017-03-064-9/+6
| * | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-06501-1638/+4338
| |\ \ \
| * | | | Minor edits, incorporate reviewZ.J. van de Weg2017-03-064-8/+9
| * | | | Fix linter errorsZ.J. van de Weg2017-03-032-2/+2
| * | | | Merge branch 'master' into 'zj-create-mattermost-team'Luke "Jared" Bennett2017-03-0271-355/+720
| |\ \ \ \
| * | | | | Corrected JS for new master js build updates [ci skip]Luke "Jared" Bennett2017-03-025-9/+10
| * | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-02641-5600/+9750
| |\ \ \ \ \
| * | | | | | Improve UXZ.J. van de Weg2017-03-0210-52/+47
| * | | | | | Review changesLuke "Jared" Bennett2017-02-284-6/+6
| * | | | | | Fix testsZ.J. van de Weg2017-02-247-15/+29
| * | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-24852-4098/+9200
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'zj-create-mattermost-team-lb' into 'zj-create-mattermost-team' Zeger-Jan van de Weg2017-02-229-15/+289
| |\ \ \ \ \ \ \
| | * | | | | | | Finished up mattermost team creationzj-create-mattermost-team-lbLuke "Jared" Bennett2017-02-229-15/+289
| |/ / / / / / /
| * | | | | | | Fix bad merge [ci skip]Z.J. van de Weg2017-02-202-6/+6
| * | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-20522-4043/+6262
| |\ \ \ \ \ \ \
| * | | | | | | | Transactional mattermost team creationZ.J. van de Weg2017-02-209-76/+42
| * | | | | | | | Merge branch 'zj-create-mattermost-team' of gitlab.com:gitlab-org/gitlab-ce i...Z.J. van de Weg2017-02-200-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Sends checkbox parameters as booleanFilipa Lacerda2017-02-081-1/+1
| | * | | | | | | | Fix form fields to bing to correct modelFilipa Lacerda2017-02-071-6/+6
| | * | | | | | | | Improve DRYness of viewsZ.J. van de Weg2017-02-079-43/+51
| | * | | | | | | | Add newline at end of icon fileFilipa Lacerda2017-02-062-2/+2
| | * | | | | | | | Adds html and css to add mattermost team name to group in new and editFilipa Lacerda2017-02-063-1/+37
| | * | | | | | | | Adds Mattermost label and icon to new group formFilipa Lacerda2017-02-063-2/+15
| | * | | | | | | | Merge branch 'master' into zj-create-mattermost-teamFilipa Lacerda2017-02-06660-4686/+11570
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add tests for Mattermost team creationZ.J. van de Weg2017-02-039-32/+73
| | * | | | | | | | | Create MM team for GitLab groupZ.J. van de Weg2017-02-0211-1/+105
View Lorry Controller Status