Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch ↵ | Jacob Schatz | 2017-01-21 | 1 | -7/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26617-search-bar-filter-dropdown-does-not-dismiss-when-sort-dropdown-is-selected' into 'master' Changed the event listener target from window to document in droplab Closes #26617 See merge request !8670 | |||||
| * | | | | | Changed the event listener target from window to document in droplab26617-search-bar-filter-dropdown-does-not-dismiss-when-sort-dropdown-is-selected | Jose Ivan Vargas | 2017-01-20 | 1 | -7/+7 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'filter-assigned-to-me' into 'master' | Jacob Schatz | 2017-01-21 | 2 | -0/+20 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added current user filter to assignee dropdown Closes #26959 and #26882 See merge request !8653 | |||||
| * | | | | | | Added current user filter to assignee dropdownfilter-assigned-to-me | Phil Hughes | 2017-01-20 | 2 | -0/+20 | |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an option in the assignee filter dropdown that allows the user to filter issues that are assigned to them Closes #26882 | |||||
* | | | | | | Merge branch 'revert-d6529dbb' into 'master' | Stan Hu | 2017-01-21 | 2 | -51/+47 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'backport-fix-load-error' into 'master'" See merge request !8678 | |||||
| * | | | | | | Revert "Merge branch 'backport-fix-load-error' into 'master'" | Stan Hu | 2017-01-21 | 2 | -51/+47 | |
|/ / / / / / | | | | | | | | | | | | | This reverts merge request !8671 | |||||
* | | | | | | Merge branch 'backport-fix-load-error' into 'master' | Stan Hu | 2017-01-21 | 2 | -47/+51 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Don't define ApplicationSetting defaults in a constant See merge request !8671 | |||||
| * | | | | | Don't define ApplicationSetting defaults in a constantbackport-fix-load-error | Rémy Coutable | 2017-01-20 | 2 | -47/+51 | |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | | Merge branch 'ah-remove-2gb-tag' into 'master' | Stan Hu | 2017-01-20 | 1 | -1/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | remove 2gb tag from ci See merge request !8672 | |||||
| * | | | | | remove 2gb tag from ciah-remove-2gb-tag | Alex Hanselka | 2017-01-20 | 1 | -1/+0 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'keep_mini_graph_down_pipelines_index' into 'master' | Fatih Acet | 2017-01-20 | 1 | -3/+28 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Keep mini graph down pipelines index See merge request !8651 | |||||
| * \ \ \ \ | Merge branch 'master' into keep_mini_graph_down_pipelines_indexkeep_mini_graph_down_pipelines_index | Regis | 2017-01-20 | 106 | -524/+1122 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| * | | | | | remove bitwise - make code human readable | Regis | 2017-01-20 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | remove need for spinner on additional clicks - visual diff is actually very nice | Regis | 2017-01-19 | 1 | -2/+0 | |
| | | | | | | ||||||
| * | | | | | handle actions and builds | Regis | 2017-01-19 | 1 | -1/+10 | |
| | | | | | | ||||||
| * | | | | | keep graph displayed when build is clicked so that multiple tabs can be ↵ | Regis | 2017-01-19 | 1 | -2/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opened from graph Also show spinner on every new request to let the user know that new data is inbound | |||||
* | | | | | | Merge branch '25709-diff-file-overflow' into 'master' | Annabel Dunstone Gray | 2017-01-20 | 5 | -4/+46 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Responsive title in diffs inline, side by side, with and without sidebar Closes #25709 See merge request !8475 | |||||
| * | | | | | Remove fixed class from file actions25709-diff-file-overflow | Annabel Dunstone Gray | 2017-01-19 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Use flexbox instead of media queries | Filipa Lacerda | 2017-01-19 | 3 | -74/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Move CSS to correct file | |||||
| * | | | | | Fix haml linter errors | Filipa Lacerda | 2017-01-19 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Adds tooltips | Filipa Lacerda | 2017-01-19 | 2 | -3/+7 | |
| | | | | | | ||||||
| * | | | | | Responsive title in diffs inline, side by side, with and without sidebar | Filipa Lacerda | 2017-01-19 | 3 | -3/+79 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Adds MR ID to CHANGELOG entry | |||||
* | | | | | | Merge branch 'fix-shared-runners-queue-update' into 'master' 26636-multiple-requests-to-ci_status-endpoints-at-the-same-time | Rémy Coutable | 2017-01-20 | 3 | -3/+60 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix shared runners queue update See merge request !8663 | |||||
| * | | | | | | Add missing specs for update build queue servicefix-shared-runners-queue-update | Grzegorz Bizon | 2017-01-20 | 2 | -1/+50 | |
| | | | | | | | ||||||
| * | | | | | | Improve readability of runner tick queue method | Grzegorz Bizon | 2017-01-20 | 1 | -3/+5 | |
| | | | | | | | ||||||
| * | | | | | | Fix shared runners queue update | Kamil Trzcinski | 2017-01-20 | 1 | -0/+6 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'participants-list' into 'master' | Fatih Acet | 2017-01-20 | 2 | -0/+8 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Fix participants margins to fit on one line See merge request !8640 | |||||
| * | | | | | Fix participants margins to fit on one lineparticipants-list | Annabel Dunstone Gray | 2017-01-19 | 2 | -0/+8 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'fix/import-users' into 'master' | Rémy Coutable | 2017-01-20 | 5 | -23/+93 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import no longer mapping users as admin Closes #25346 See merge request !8625 | |||||
| * | | | | | | fix member mapper specfix/import-users | James Lopez | 2017-01-20 | 2 | -26/+1 | |
| | | | | | | | ||||||
| * | | | | | | fix typo | James Lopez | 2017-01-19 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | add missing changelog | James Lopez | 2017-01-19 | 1 | -0/+4 | |
| | | | | | | | ||||||
| * | | | | | | fix and refactor note user mapping | James Lopez | 2017-01-18 | 4 | -18/+41 | |
| | | | | | | | ||||||
| * | | | | | | added spec replicating the problem | James Lopez | 2017-01-18 | 3 | -3/+60 | |
| | | | | | | | ||||||
| * | | | | | | do not map usersat all unless admin | James Lopez | 2017-01-18 | 2 | -3/+14 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' | Robert Speicher | 2017-01-20 | 12 | -104/+141 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't persist application settings in test env See merge request !8573 | |||||
| * | | | | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env | Rémy Coutable | 2017-01-15 | 11 | -36/+97 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | Move default values to ApplicationSetting::DEFAULTS and use it in ↵ | Rémy Coutable | 2017-01-15 | 2 | -69/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CurrentSettings Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | | | | | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' | Yorick Peterse | 2017-01-20 | 3 | -5/+33 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record used SSH keys only once per day Closes #26877 See merge request !8655 | |||||
| * | | | | | | | | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-day | Adam Niedzielski | 2017-01-20 | 3 | -5/+33 | |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitlab::ExclusiveLease to make sure that we enqueue Sidekiq job at most once per day for given key. | |||||
* | | | | | | | | Merge branch 'workhorse-v1.3.0' into 'master' 26423-organize-labels-by-color-in-the-labels-page | Rémy Coutable | 2017-01-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Workhorse v1.3.0 See merge request !8660 | |||||
| * | | | | | | | | Use Workhorse v1.3.0 | Nick Thomas | 2017-01-20 | 1 | -1/+1 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch '25851-document-token-scopes' into 'master' | Rémy Coutable | 2017-01-20 | 2 | -3/+13 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation around OAuth/Personal Access Token scopes. Closes #25851 See merge request !8226 | |||||
| * | | | | | | | Add documentation around OAuth/Personal Access Token scopes. | Timothy Andrew | 2017-01-19 | 2 | -3/+13 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IE | Rémy Coutable | 2017-01-20 | 4 | -131/+125 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `:empty_project` in Project, User, MergeRequest, and MoveToProjectFinder specs See merge request !8648 | |||||
| * | | | | | | | | Convert MoveToProjectFinder specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -10/+10 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Convert most MergeRequest model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -22/+22 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Convert most User model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -45/+39 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Convert most Project model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -54/+54 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' | Rémy Coutable | 2017-01-20 | 20 | -45/+71 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380 |