summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed duplicate pagination on explore#groupsduplicate-pagination-group-explorePhil Hughes2017-03-161-2/+0
* Merge branch 'pipeline-tooltips-overflow' into 'master' Filipa Lacerda2017-03-162-0/+8
|\
| * Fixed pipeline action tooltips being cut offpipeline-tooltips-overflowPhil Hughes2017-03-152-0/+8
* | Merge branch '28494-mini-pipeline-graph-commit-view' into 'master' Jacob Schatz2017-03-169-10/+127
|\ \
| * | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-169-10/+127
* | | Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-163-58/+70
|\ \ \ | |/ / |/| |
| * | Fix redis specDouwe Maan2017-03-152-33/+31
| * | Fix config/mail_room.yml to be interpretable RubyDouwe Maan2017-03-151-0/+1
| * | Verify config/mail_room.yml is interpretable RubyDouwe Maan2017-03-152-27/+40
* | | Merge branch 'group-gear-setting-dropdown-to-tab' into 'master' Douwe Maan2017-03-166-20/+25
|\ \ \
| * | | Changed "Edit Group" subtab to "General" and moved itgroup-gear-setting-dropdown-to-tabJose Ivan Vargas2017-03-152-11/+7
| * | | Fixed some missing permission conditionsJose Ivan Vargas2017-03-142-11/+12
| * | | Fixed haml_lint warning for the settings_head partialJose Ivan Vargas2017-03-142-2/+1
| * | | Moved the gear settings dropdown in the group view to a tabJose Ivan Vargas2017-03-146-19/+28
* | | | Merge branch 'rs-revert-notified-of-own-activity-migration' into 'master' Robert Speicher2017-03-152-1/+25
|\ \ \ \
| * | | | Revert the AddNotifiedOfOwnActivityToUsers migrationrs-revert-notified-of-own-activity-migrationRobert Speicher2017-03-152-1/+25
|/ / / /
* | | | Merge branch '8836-mr-revert' into 'master' Robert Speicher2017-03-1510-168/+6
|\ \ \ \
| * | | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-1510-168/+6
* | | | | Merge branch 'docs/add-missing-steps-in-pages-source-install' into 'master' Robert Speicher2017-03-151-20/+62
|\ \ \ \ \
| * | | | | Bump pages daemon to 0.4.0docs/add-missing-steps-in-pages-source-installAchilleas Pipinellis2017-03-141-5/+5
| * | | | | Add missing steps of Pages source installationAchilleas Pipinellis2017-03-141-20/+62
* | | | | | Merge branch 'add_quick_submit_for_snippet_forms' into 'master' Clement Ho2017-03-152-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add quick submit for snippet formsblackst0ne2017-03-142-1/+5
* | | | | | Merge branch 'better-priority-sorting' into 'master' Douwe Maan2017-03-1525-27/+213
|\ \ \ \ \ \
| * | | | | | Allow filtering by all started milestonesbetter-priority-sortingSean McGivern2017-03-1515-12/+107
| * | | | | | Allow sorting by due date and label prioritySean McGivern2017-03-1510-15/+106
* | | | | | | Merge branch 'revert-e52529e2' into 'master' Sean McGivern2017-03-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'"Rémy Coutable2017-03-151-1/+1
* | | | | | | | Merge branch '27174-filter-filters' into 'master' Clement Ho2017-03-155-16/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | prevent filtering Issues by multiple milestones, authors, or assignees27174-filter-filtersSimon Knox2017-03-115-16/+53
* | | | | | | | | Merge branch 'dm-copy-code-as-gfm' into 'master' Sean McGivern2017-03-1512-368/+559
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove selectionToGFMdm-copy-code-as-gfmDouwe Maan2017-03-142-9/+7
| * | | | | | | | | Fix specsDouwe Maan2017-03-147-24/+24
| * | | | | | | | | Document tag option and clarify specDouwe Maan2017-03-142-5/+4
| * | | | | | | | | Copy code as GFM from diffs, blobs and GFM code blocksDouwe Maan2017-03-146-343/+537
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'filter-search-scrollbar' into 'master' Clement Ho2017-03-151-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | don't show scrollbar on search field unless necessaryfilter-search-scrollbarSimon Knox2017-03-111-1/+1
* | | | | | | | | Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master' Douwe Maan2017-03-155-3/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhookRuben Davila2017-03-145-3/+31
* | | | | | | | | | Merge branch 'issue_29449' into 'master' Rémy Coutable2017-03-152-5/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove whitespace in group linksXurxo2017-03-152-5/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master' Robert Speicher2017-03-153-35/+66
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-153-35/+66
* | | | | | | | | | Merge branch 'docs/nested-groups' into 'master' Achilleas Pipinellis2017-03-157-0/+166
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change naming from nested groups to subgroupsdocs/nested-groupsAchilleas Pipinellis2017-03-151-1/+1
| * | | | | | | | | | Address subgroups docs reviewAchilleas Pipinellis2017-03-141-47/+39
| * | | | | | | | | | Fix wordingAchilleas Pipinellis2017-03-141-2/+2
| * | | | | | | | | | Add info on group membershipAchilleas Pipinellis2017-03-141-10/+29
| * | | | | | | | | | Add nested groups documentationAchilleas Pipinellis2017-03-147-0/+155
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '28277-document-u2f-limitations-with-multiple-urls' into 'master' Achilleas Pipinellis2017-03-152-0/+15
|\ \ \ \ \ \ \ \ \ \