summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix project-last-commit alignmentfix-project-last-commit-paddingAnnabel Dunstone Gray2017-03-062-23/+9
|
* 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
| | | | | | | | | |
| * | | | | | | | | Adds Mattermost label and icon to new group formFilipa Lacerda2017-02-163-2/+15
| | | | | | | | | |
| * | | | | | | | | Add tests for Mattermost team creationZ.J. van de Weg2017-02-169-31/+72
| | | | | | | | | |
| * | | | | | | | | Create MM team for GitLab groupZ.J. van de Weg2017-02-1611-1/+105
| | | | | | | | | |
* | | | | | | | | | Merge branch '21605-allow-html5-details' into 'master' Douwe Maan2017-03-0611-5/+50
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SanitizationFilter allows html5 details and summary (Issue #21605) Closes #21605 See merge request !6568
| * | | | | | | | | | Updates Redcarpet (Markdown parser) to 3.4.0James Edwards-Jones2017-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds suppport for HTML 5 details and summary tags (https://github.com/vmg/redcarpet/issues/578)
| * | | | | | | | | | SanitizationFilter allows html5 details and summary (Issue #21605)James2017-03-069-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds details/summary tags to Copy-as-GFM
* | | | | | | | | | | Merge branch 'pipeline-blocking-actions' into 'master' Kamil Trzciński2017-03-0642-421/+971
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make manual actions blocking Closes #26360 and #22628 See merge request !9585
| * | | | | | | | | | | Migrate legacy actions in post deployment migrationGrzegorz Bizon2017-03-062-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-0674-298/+1207
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Fix UserBasic Rename `/take` to `/take_ownership`, expose `owner` in `v3`. Update after review Fix values being called at Array instead of Hash Fix json response in branches controller Improve docs and specs related to pages artifacts Add MR fo changelog about removing pages artifacts Delete artifacts for pages unless expiry date is specified Lint doc Improved team selection Move foreign key to separate migration Fix import model attributes Update documentation and expose ID Introduce tests for pipeline triggers Fix trigger model Update db/schema Make triggers to be user aware Make Pipeline Triggers to be user aware Update triggers API Remove remnants of git annex ... Conflicts: db/schema.rb
| * | | | | | | | | | | Fix Rubocop offenses in commit status/build specsGrzegorz Bizon2017-03-062-12/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Ignore optional actions when calculating warningsGrzegorz Bizon2017-03-063-3/+32
| | | | | | | | | | | |
| * | | | | | | | | | | Highligh info about optional action status in docsGrzegorz Bizon2017-03-061-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Improve specs for detailed statuses with manual actionsGrzegorz Bizon2017-03-0614-57/+42
| | | | | | | | | | | |
View Lorry Controller Status