summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-074-9/+46
* Merge branch '43486-update-language-about-version-check-in-admin-settings-and...Sean McGivern2018-03-073-12/+20
|\
| * Clarify version check in admin settings43486-update-language-about-version-check-in-admin-settings-and-docsSean McGivern2018-03-073-12/+20
* | Merge branch 'replace_redcarpet_with_cmark' into 'master'Sean McGivern2018-03-0712-35/+165
|\ \
| * | Add CommonMark markdown enginereplace_redcarpet_with_cmarkblackst0ne2018-03-0712-35/+165
* | | Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-078-0/+299
|\ \ \
| * | | Shortcut and return on duplicate record error.43460-track-projects-a-user-contributed-toAndreas Brandl2018-03-061-3/+3
| * | | Improve robustness of migration.Andreas Brandl2018-03-061-6/+39
| * | | Nested transaction for find_or_create_by! queries.Andreas Brandl2018-03-061-5/+11
| * | | Remove unnecessary safe guard.Andreas Brandl2018-03-061-6/+0
| * | | Operate on ids to avoid unnecessary loading.Andreas Brandl2018-03-062-5/+5
| * | | Singularize model name.Andreas Brandl2018-03-064-9/+9
| * | | For MySQL, foreign keys are dependent on index.Andreas Brandl2018-03-062-3/+6
| * | | Rename to UserInteractedProjects.Andreas Brandl2018-03-0610-60/+60
| * | | Improve migration robustness and speed.Andreas Brandl2018-03-063-4/+10
| * | | Add changelog.Andreas Brandl2018-03-061-0/+5
| * | | Flush cached information about schema.Andreas Brandl2018-03-061-0/+6
| * | | Only track contributions if table is available.Andreas Brandl2018-03-064-2/+36
| * | | Address rubocop offenses.Andreas Brandl2018-03-062-34/+35
| * | | Treat special cases accordingly.Andreas Brandl2018-03-062-1/+23
| * | | Cache project/user combinations.Andreas Brandl2018-03-062-6/+23
| * | | Track which projects a user contributed to.Andreas Brandl2018-03-064-0/+63
| * | | Simpler migration strategy for MySQL.Andreas Brandl2018-03-061-29/+58
| * | | Add post-migration to populate user_contributed_projects table.Andreas Brandl2018-03-061-0/+48
| * | | Create user_contributed_projects table.Andreas Brandl2018-03-062-0/+32
* | | | Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets2018-03-075-50/+88
|\ \ \ \
| * | | | Add feature test for plugins on system hooks pagedz-plugins-project-integrationsDmitriy Zaporozhets2018-03-061-0/+10
| * | | | Remove plugins from project integrations pageDmitriy Zaporozhets2018-03-063-6/+14
| * | | | Remove boolean icons from plugins pageDmitriy Zaporozhets2018-03-051-1/+0
| * | | | Render plugins list on system hooks pageDmitriy Zaporozhets2018-03-053-53/+53
| * | | | Show plugins list on project integrations pageDmitriy Zaporozhets2018-03-052-0/+21
* | | | | Merge branch 'consistent-deployment_platform' into 'master'Grzegorz Bizon2018-03-072-2/+3
|\ \ \ \ \
| * | | | | Unify deployment_platform interface with EELin Jen-Shin2018-03-072-2/+3
* | | | | | Merge branch 'fix-group-boards-migration-name' into 'master'Sean McGivern2018-03-071-1/+1
|\ \ \ \ \ \
| * | | | | | Fix group boards migration nameSean McGivern2018-03-071-1/+1
* | | | | | | Merge branch 'include-mr-discussions-calendar-activity' into 'master'Sean McGivern2018-03-073-2/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Count discussions on issues and merge requests as contributions for the contr...Riccardo Padovani2018-03-073-2/+9
|/ / / / / /
* | | | | | Merge branch '43502-clipboard-btn' into 'master'Phil Hughes2018-03-077-2/+13
|\ \ \ \ \ \
| * | | | | | Removes btn-transparent and btn-clipboard as default classes for clipboard bu...43502-clipboard-btnFilipa Lacerda2018-03-067-2/+13
* | | | | | | Merge branch 'gitlab-shell-6-0-4' into 'master'Sean McGivern2018-03-071-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Bump Gitlab Shell to v6.0.4gitlab-shell-6-0-4Alejandro Rodríguez2018-03-061-1/+1
| |/ / / / /
* | | | | | Merge branch 'master' into 'master'Grzegorz Bizon2018-03-073-6/+59
|\ \ \ \ \ \
| * | | | | | CI charts now include the current dayDakkaron2018-03-063-6/+59
* | | | | | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-078-30/+68
|\ \ \ \ \ \ \
| * | | | | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-068-30/+68
* | | | | | | | Merge branch 'remove-common-vue' into 'master'Clement Ho2018-03-0612-31/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove common_vue bundleMike Greiling2018-03-0612-31/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'ee-183-common-code-backport' into 'master'Sean McGivern2018-03-062-1/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-062-1/+23
|/ / / / / / / /
* | | | | | | | Merge branch 'banzai-n-plus-one' into 'master'Douwe Maan2018-03-061-1/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |