summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-0625-12/+446
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | # Conflicts: # spec/models/group_spec.rb
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This more closely resembles the development and production paths in that paths contain `public/uploads`, rather than `uploads/uploads` as they did before.
| * | | | | | | | | | Fix Projects::UploadService specRobert Speicher2017-03-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reasons unknown, this spec was passing a project's repository as the first argument to `Projects::UploadService`, while it was expecting the project itself. Previously this wasn't a problem because `FileUploader` only needed the object to respond to `path_with_namespace`, which Repository and Project both did. But now because of `Upload` and its polymorphic association, it expects the object to respond to `primary_key`.
| * | | | | | | | | | 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 buttons See merge request !9692
| * | | | | | | | | | | 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.com See merge request !9739
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create Mattermost Team from GitLab Closes #23964 See merge request !8746
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js.es6
| * | | | | | | | | | | | 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 creation See merge request !9413
| | * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, but still on this feature branch, the creation of mattermost teams where a background job. However, it was decided it was better that these happened as transaction so feedback could be displayed to the user.
| * | | | | | | | | | | | | | | Merge branch 'zj-create-mattermost-team' of gitlab.com:gitlab-org/gitlab-ce ↵Z.J. van de Weg2017-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zj-create-mattermost-team
| | * | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (313 commits) Introduce maximum session time for terminal websocket connection add CHANGELOG entry for !8988 transpile all javascript files with babel add npm run webpack command lazy-load ace config so that we can ensure window.gon exists fix ace editor modules to include asset digest in production Ensure the right content is served for the build artifacts API Add index to labels for `type` and project_id` fix rack-proxy dependency in production Fixed typo fix failing test fix Vue warnings for missing element [ci skip] UX Guide: Button placement in groups Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed eslint test failure Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index ...
| | * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Sends checkbox parameters as booleanFilipa Lacerda2017-02-161-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix form fields to bing to correct modelFilipa Lacerda2017-02-161-6/+6
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Improve DRYness of viewsZ.J. van de Weg2017-02-168-43/+39
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add newline at end of icon fileFilipa Lacerda2017-02-162-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Adds html and css to add mattermost team name to group in new and editFilipa Lacerda2017-02-163-1/+37
| | | | | | | | | | | | | | | | | |
View Lorry Controller Status