summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-0625-183/+702
| |\ | | | | | | | | | | | | Improve pipeline triggers API See merge request !9713
| | * Fix UserBasicintroduce-pipeline-triggersKamil Trzcinski2017-03-061-1/+1
| | |
| | * Rename `/take` to `/take_ownership`, expose `owner` in `v3`.Kamil Trzcinski2017-03-064-7/+8
| | |
| | * Update after reviewKamil Trzcinski2017-03-063-1/+5
| | |
| | * Lint docKamil Trzcinski2017-03-051-2/+2
| | |
| | * Move foreign key to separate migrationKamil Trzcinski2017-03-053-3/+13
| | |
| | * Fix import model attributesKamil Trzcinski2017-03-052-0/+3
| | |
| | * Update documentation and expose IDKamil Trzcinski2017-03-054-109/+172
| | |
| | * Introduce tests for pipeline triggersKamil Trzcinski2017-03-056-52/+145
| | |
| | * Fix trigger modelKamil Trzcinski2017-03-051-1/+0
| | |
| | * Update db/schemaKamil Trzcinski2017-03-053-3/+6
| | |
| | * Make triggers to be user awareKamil Trzcinski2017-03-056-7/+31
| | |
| | * Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-053-3/+28
| | | | | | | | | | | | | | | | | | | | | - they can have owner, - they can be edited, - they have description, - you can take ownership of them
| | * Update triggers APIKamil Trzcinski2017-03-055-17/+311
| | |
| * | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-0611-57/+11
| |\ \ | | | | | | | | | | | | | | | | Remove remnants of git annex See merge request !9508
| | * | Remove remnants of git annexPawel Chojnacki2017-03-0311-57/+11
| | | |
| * | | Merge branch '26384-improve-omnibus-mattermost-command-installation-flow' ↵Kamil Trzciński2017-03-069-31/+57
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Improve Omnibus-Mattermost Command installation flow" See merge request !9257
| | * | | Fix values being called at Array instead of HashZ.J. van de Weg2017-03-062-4/+4
| | | | |
| | * | | Improved team selectionLuke "Jared" Bennett2017-03-057-27/+53
| | | | | | | | | | | | | | | | | | | | Review changes
| * | | | Merge branch 'delete-pages' into 'master' Grzegorz Bizon2017-03-064-0/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delete artifacts for pages unless expiry date is specified See merge request !9716
| | * | | | Improve docs and specs related to pages artifactsGrzegorz Bizon2017-03-062-2/+4
| | | | | |
| | * | | | Add MR fo changelog about removing pages artifactsGrzegorz Bizon2017-03-061-1/+1
| | | | | |
| | * | | | Delete artifacts for pages unless expiry date is specifieddelete-pagesKamil Trzcinski2017-03-054-0/+29
| | | |_|/ | | |/| |
| * | | | Merge branch '28898-fix-search-branches-in-cherry-picking' into 'master' Sean McGivern2017-03-063-1/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix json response in branches controller Closes #28898 See merge request !9710
| | * | | | Fix json response in branches controllerGeorge Andrinopoulos2017-03-063-1/+28
| | | | | |
| * | | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-0616-10/+348
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ETag to improve performance of issue notes polling Closes #27582 See merge request !9036
| | * | | | | Execute metrics initializer earlieretag-notes-pollingAdam Niedzielski2017-03-013-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that Gitlab::Metrics::RackMiddleware is added before Gitlab::EtagCaching::Middleware.
| | * | | | | Invalidate ETag cache when note changesAdam Niedzielski2017-03-012-0/+25
| | | | | | |
| | * | | | | Add middleware for ETag caching with RedisAdam Niedzielski2017-03-015-0/+269
| | | | | | |
| | * | | | | Remove query parameters from notes polling endpoint to make caching easierAdam Niedzielski2017-03-016-8/+52
| | | | | | |
| * | | | | | Merge branch 'change-colour-for-testing-fallback' into 'master' Rémy Coutable2017-03-061-5/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change language for testing colour fallback See merge request !9537
| | * | | | | | Change language for testing colour fallbackGeorg G2017-02-261-5/+5
| | | | | | | |
| * | | | | | | Merge branch ↵Rémy Coutable2017-03-065-12/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28655-current-path-text-is-not-updated-after-setting-the-new-username' into 'master' Update profiles/account view to display new username Closes #28655 See merge request !9650
| | * | | | | | | Update profiles/account view to display new usernameMark Fletcher2017-03-025-12/+26
| | | | | | | | |
| * | | | | | | | Merge branch 'cache-gems-for-ee' into 'master' Grzegorz Bizon2017-03-061-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable build job for caching Gems of GitLab EE See merge request !9712
| | * | | | | | | | Enable build job for caching Gems of GitLab EEcache-gems-for-ee💃 Winnie 💃2017-03-051-0/+1
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'remove-es6-extension' into 'master' Clement Ho2017-03-05240-1/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Remove es6 file extension from JavaScript files See merge request !9241
| | * | | | | | | Remove .es6 from file extensions (!9241)winniehell2017-03-05238-0/+0
| | | | | | | | |
| | * | | | | | | Adjust ESLint rule for file nameswinniehell2017-03-052-1/+5
| |/ / / / / / /
| * | | | | | | Merge branch 'pages-for-ee' into 'master' Kamil Trzciński2017-03-051-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable GitLab pages job for GitLab EE See merge request !9703
| | * | | | | | | Re-enable GitLab pages job for GitLab EEpages-for-ee💃 Winnie 💃2017-03-041-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'format-timeago-date' into 'master' Jacob Schatz2017-03-054-5/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats timeago dates to be more friendly Closes #27537 See merge request !9145
| | * | | | | | | | Fixed timeago specsformat-timeago-datePhil Hughes2017-02-132-4/+4
| | | | | | | | | |
| | * | | | | | | | Formats timeago dates to be more friendlyPhil Hughes2017-02-102-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats the timeago timestamps to be a short date. This will only be visible on slower connections whilst the JS is loading, after the JS has loaded it will be turned into a timeago string Closes #27537
View Lorry Controller Status