summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Hide the Todo button in the collapsed issuable sidebar.hide-todo-collapsed-sidebarConnor Shea2016-06-151-0/+5
* Merge branch 'remove-shell-env' into 'master' Douwe Maan2016-06-155-37/+13
|\
| * Get rid of Gitlab::ShellEnvJacob Vosmaer2016-06-155-37/+13
* | Merge branch '18338-change-admin-navigation-to-match-new-ui' into 'master' Dmitriy Zaporozhets2016-06-1515-603/+634
|\ \
| * | Fix admin hooks specDmitriy Zaporozhets2016-06-151-1/+3
| * | Rearrange order of tabsAnnabel Dunstone2016-06-152-8/+8
| * | Fix admin active tab testsDmitriy Zaporozhets2016-06-152-26/+32
| * | Nest li elements directly under ul18338-change-admin-navigation-to-match-new-uiAnnabel Dunstone2016-06-152-4/+4
| * | Move builds tab to admin overviewAnnabel Dunstone2016-06-153-54/+59
| * | Add monitoring link with subtabsAnnabel Dunstone2016-06-155-119/+137
| * | Add sub links to overviewAnnabel Dunstone2016-06-156-379/+399
| * | Add counter for abuse reportsAnnabel Dunstone2016-06-151-0/+1
| * | Remove admin layout-nav countersAnnabel Dunstone2016-06-151-4/+0
| * | Move admin nav to horizontal layout navAnnabel Dunstone2016-06-152-21/+4
* | | Merge branch 'preventdefault-disabled-buttons' into 'master' Jacob Schatz2016-06-155-0/+41
|\ \ \
| * | | Prevent default disabled buttons and links.preventdefault-disabled-buttonsFatih Acet2016-06-155-0/+41
* | | | Merge branch 'show_number_of_mrs_in_milestone_page' into 'master' Jacob Schatz2016-06-151-4/+4
|\ \ \ \
| * | | | show number of processed mrs in milestone pageshow_number_of_mrs_in_milestone_pageArinde Eniola2016-06-131-4/+4
* | | | | Merge branch 'add-index-on-requested_at-to-members' into 'master' Yorick Peterse2016-06-152-1/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add index on `requested_at` to the `members` tableadd-index-on-requested_at-to-membersRémy Coutable2016-06-152-1/+11
* | | | | Merge branch 'mr-buttons-update' into 'master' Jacob Schatz2016-06-156-43/+70
|\ \ \ \ \
| * | | | | Fixed issue with MR buttons being in a groupmr-buttons-updatePhil Hughes2016-06-136-43/+70
* | | | | | Merge branch '18225-avoid-full-table-users-count' into 'master' Jacob Vosmaer (GitLab)2016-06-151-1/+1
|\ \ \ \ \ \
| * | | | | | Check if the Users table has exactly one user limiting the whole set18225-avoid-full-table-users-countPaco Guzman2016-06-061-1/+1
* | | | | | | Merge branch 'docker-registry-manifest-v1' into 'master' Rémy Coutable2016-06-157-33/+125
|\ \ \ \ \ \ \
| * | | | | | | Show created_at in table columndocker-registry-manifest-v1Kamil Trzcinski2016-06-151-5/+5
| * | | | | | | Add support for Docker Registry manifest v1Kamil Trzcinski2016-06-157-32/+124
* | | | | | | | Merge branch 'issuable-sidebar-dropdown-deselect-fix' into 'master' Jacob Schatz2016-06-153-2/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue with de-selecting dropdown option in issue sidebarissuable-sidebar-dropdown-deselect-fixPhil Hughes2016-06-153-2/+43
* | | | | | | | | Merge branch 'tooltip-change' into 'master' Jacob Schatz2016-06-154-1/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Update CHANGELOG.tooltip-changeFatih Acet2016-06-151-0/+1
| * | | | | | | | Fix project star tooltip on the fly.Fatih Acet2016-06-152-0/+14
| * | | | | | | | Fix project star tooltip in to show actual message.Fatih Acet2016-06-151-1/+1
* | | | | | | | | Merge branch 'eager-loading-issue-parser' into 'master' Douwe Maan2016-06-152-1/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Eager load project relations in IssueParserYorick Peterse2016-06-152-1/+16
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-1510-5/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-1210-5/+27
* | | | | | | | | Merge branch 'list-items' into 'master' Jacob Schatz2016-06-154-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove div between ul and lilist-itemsAnnabel Dunstone2016-06-134-6/+7
* | | | | | | | | | Merge branch 'zj-system-notes-not-awardable' into 'master' Douwe Maan2016-06-151-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Award Emoji can't be awarded on system notes backendzj-system-notes-not-awardableZ.J. van de Weg2016-06-151-0/+4
* | | | | | | | | | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-1546-40/+880
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use validate and required for environment and projectKamil Trzcinski2016-06-152-3/+3
| * | | | | | | | | | Make project_id, iid unique for deploymentsKamil Trzcinski2016-06-152-2/+469
| * | | | | | | | | | Validate project and environment instead of only requiringKamil Trzcinski2016-06-153-473/+6
| * | | | | | | | | | Make `project_id` and `environment_id` nullableenvironments-and-deploymentsKamil Trzcinski2016-06-153-5/+7
| * | | | | | | | | | Create_deployment ability is need to create retry or rollback deploymentKamil Trzcinski2016-06-152-3/+3
| * | | | | | | | | | Add CHANGELOGKamil Trzcinski2016-06-151-0/+1
| * | | | | | | | | | Make environments_spec more feature-specKamil Trzcinski2016-06-151-57/+56
| * | | | | | | | | | Improve cyclomatic of ability::allowedKamil Trzcinski2016-06-151-15/+1