summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '23096-expire-artifacts-per-job' into 'master' Yorick Peterse2016-10-072-6/+16
|\
| * ExpireBuildArtifactsWorker query builds table without ordering enqueuing one ...23096-expire-artifacts-per-jobPaco Guzman2016-10-072-6/+16
* | Merge branch '22774-retouch-environments-deployments' into 'master' Jacob Schatz2016-10-077-53/+105
|\ \
| * | Removes `try`Filipa Lacerda2016-10-061-1/+1
| * | Removes unused variableFilipa Lacerda2016-10-061-2/+0
| * | Fixes external_url linkFilipa Lacerda2016-10-061-1/+1
| * | Removes Merge Request reference from commit column due to performance issuesFilipa Lacerda2016-10-061-4/+0
| * | Adds responsive behaviour equal to the one in Pipelines and Builds tableFilipa Lacerda2016-10-065-47/+54
| * | Fixes linter problemsFilipa Lacerda2016-10-061-1/+1
| * | Verifies if user is availableFilipa Lacerda2016-10-061-2/+4
| * | Removes 'hidden-xs' class from user_avatar helper in order for it to be visib...Filipa Lacerda2016-10-061-1/+4
| * | Adds verification beore showing user avatarFilipa Lacerda2016-10-061-2/+3
| * | Adds external urlFilipa Lacerda2016-10-053-3/+24
| * | Adds reference to the merge request in the commit columnFilipa Lacerda2016-10-052-0/+12
| * | Adds Build column to environments listFilipa Lacerda2016-10-053-0/+7
| * | Updates Last Deployment column in environmnets list according to designFilipa Lacerda2016-10-053-3/+8
| * | Updates Last Deployment column in environmnets list.Filipa Lacerda2016-10-052-2/+2
* | | Merge branch 'backport-part-of-ee-744' into 'master' Robert Speicher2016-10-071-1/+6
|\ \ \
| * | | Make Member#add_user set access_level for requestersbackport-part-of-ee-744Rémy Coutable2016-10-031-1/+6
* | | | Merge branch 'rs-optimize-award_user_list-spec' into 'master' Rémy Coutable2016-10-071-3/+2
|\ \ \ \
| * | | | Optimize the `award_user_list` helper specRobert Speicher2016-10-071-3/+2
* | | | | Merge branch 'mrchrisw/remove-whitelist' into 'master' Robert Speicher2016-10-071-1/+1
|\ \ \ \ \
| * | | | | Update user whitelist reject messagemrchrisw/remove-whitelistdev-chris2016-10-071-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-fix-events-update-spec' into 'master' Yorick Peterse2016-10-071-1/+1
|\ \ \ \ \
| * | | | | Fix Event#reset_project_activity updatessh-fix-events-update-specStan Hu2016-10-061-1/+1
* | | | | | Merge branch '18337-cache-html-in-database' into 'master' Robert Speicher2016-10-0755-80/+311
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-0733-63/+54
| * | | | | Make search results use the markdown cache columns, treating them consistentlyNick Thomas2016-10-075-6/+16
| * | | | | Use CacheMarkdownField for notesNick Thomas2016-10-072-2/+5
| * | | | | Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-0716-9/+236
* | | | | | Merge branch 'forks_tooltip' into 'master' Fatih Acet2016-10-071-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add tooltip to project fork countJustin DiPierro2016-10-061-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch '23025-issue-boards-defaults' into 'master' Jacob Schatz2016-10-062-8/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Change issue board defaultsAnnabel Dunstone Gray2016-10-062-8/+4
| |/ / /
* | | | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-063-8/+8
|\ \ \ \
| * | | | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-053-8/+8
* | | | | Merge branch 'link-to-registry-from-project-settings' into 'master' Achilleas Pipinellis2016-10-061-1/+2
|\ \ \ \ \
| * | | | | Link to Registry docs from project settingsAchilleas Pipinellis2016-10-061-1/+2
* | | | | | Merge branch 'update-profile-view' into 'master' Annabel Dunstone Gray2016-10-062-20/+9
|\ \ \ \ \ \
| * | | | | | spacing tweaksupdate-profile-viewtauriedavis2016-10-061-12/+1
| * | | | | | add spaces and fix handle stylestauriedavis2016-10-042-6/+10
| * | | | | | update profile viewtauriedavis2016-10-031-6/+2
* | | | | | | Merge branch 'dz-root-url' into 'master' Dmitriy Zaporozhets2016-10-064-12/+7
|\ \ \ \ \ \ \
| * | | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-064-12/+7
* | | | | | | | Merge branch 'sh-fix-issue-perf-order-by-issue' into 'master' Yorick Peterse2016-10-061-1/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Improve issue load time performance by avoiding ORDER BY in find_by callsh-fix-issue-perf-order-by-issueStan Hu2016-10-061-1/+2
* | | | | | | | Merge branch 'replace-bootstrap-caret' into 'master' Jacob Schatz2016-10-0630-59/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Replace bootstrap caret with fontawesome caretClement Ho2016-10-0530-59/+62
* | | | | | | | Merge branch 'deploy-widget' into 'master' Annabel Dunstone Gray2016-10-061-2/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Only hide external link text, not icon/link.deploy-widgetBryce Johnson2016-10-061-2/+3