summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'filter-assigned-to-me' into 'master' Jacob Schatz2017-01-212-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added current user filter to assignee dropdownfilter-assigned-to-mePhil Hughes2017-01-202-0/+20
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'revert-d6529dbb' into 'master' Stan Hu2017-01-212-51/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Merge branch 'backport-fix-load-error' into 'master'"Stan Hu2017-01-212-51/+47
|/ / / / / / / / /
* | | | | | | | | Merge branch 'backport-fix-load-error' into 'master' Stan Hu2017-01-212-47/+51
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Don't define ApplicationSetting defaults in a constantbackport-fix-load-errorRémy Coutable2017-01-202-47/+51
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ah-remove-2gb-tag' into 'master' Stan Hu2017-01-201-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | remove 2gb tag from ciah-remove-2gb-tagAlex Hanselka2017-01-201-1/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'keep_mini_graph_down_pipelines_index' into 'master' Fatih Acet2017-01-201-3/+28
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into keep_mini_graph_down_pipelines_indexkeep_mini_graph_down_pipelines_indexRegis2017-01-20106-524/+1122
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | remove bitwise - make code human readableRegis2017-01-201-3/+3
| * | | | | | | | remove need for spinner on additional clicks - visual diff is actually very niceRegis2017-01-191-2/+0
| * | | | | | | | handle actions and buildsRegis2017-01-191-1/+10
| * | | | | | | | keep graph displayed when build is clicked so that multiple tabs can be opene...Regis2017-01-191-2/+20
* | | | | | | | | Merge branch '25709-diff-file-overflow' into 'master' Annabel Dunstone Gray2017-01-205-4/+46
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove fixed class from file actions25709-diff-file-overflowAnnabel Dunstone Gray2017-01-192-2/+2
| * | | | | | | | Use flexbox instead of media queriesFilipa Lacerda2017-01-193-74/+36
| * | | | | | | | Fix haml linter errorsFilipa Lacerda2017-01-191-3/+3
| * | | | | | | | Adds tooltipsFilipa Lacerda2017-01-192-3/+7
| * | | | | | | | Responsive title in diffs inline, side by side, with and without sidebarFilipa Lacerda2017-01-193-3/+79
* | | | | | | | | Merge branch 'fix-shared-runners-queue-update' into 'master' 26636-multiple-requests-to-ci_status-endpoints-at-the-same-timeRémy Coutable2017-01-203-3/+60
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing specs for update build queue servicefix-shared-runners-queue-updateGrzegorz Bizon2017-01-202-1/+50
| * | | | | | | | | Improve readability of runner tick queue methodGrzegorz Bizon2017-01-201-3/+5
| * | | | | | | | | Fix shared runners queue updateKamil Trzcinski2017-01-201-0/+6
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'participants-list' into 'master' Fatih Acet2017-01-202-0/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix participants margins to fit on one lineparticipants-listAnnabel Dunstone Gray2017-01-192-0/+8
* | | | | | | | | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-205-23/+93
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix member mapper specfix/import-usersJames Lopez2017-01-202-26/+1
| * | | | | | | | | fix typoJames Lopez2017-01-191-1/+1
| * | | | | | | | | add missing changelogJames Lopez2017-01-191-0/+4
| * | | | | | | | | fix and refactor note user mappingJames Lopez2017-01-184-18/+41
| * | | | | | | | | added spec replicating the problemJames Lopez2017-01-183-3/+60
| * | | | | | | | | do not map usersat all unless adminJames Lopez2017-01-182-3/+14
* | | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-2012-104/+141
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-1511-36/+97
| * | | | | | | | | | Move default values to ApplicationSetting::DEFAULTS and use it in CurrentSett...Rémy Coutable2017-01-152-69/+45
* | | | | | | | | | | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' Yorick Peterse2017-01-203-5/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-dayAdam Niedzielski2017-01-203-5/+33
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'workhorse-v1.3.0' into 'master' 26423-organize-labels-by-color-in-the-labels-pageRémy Coutable2017-01-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use Workhorse v1.3.0Nick Thomas2017-01-201-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '25851-document-token-scopes' into 'master' Rémy Coutable2017-01-202-3/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add documentation around OAuth/Personal Access Token scopes.Timothy Andrew2017-01-192-3/+13
* | | | | | | | | | | Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IERémy Coutable2017-01-204-131/+125
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Convert MoveToProjectFinder specs to use `:empty_project`Robert Speicher2017-01-191-10/+10
| * | | | | | | | | | | Convert most MergeRequest model specs to use `:empty_project`Robert Speicher2017-01-191-22/+22
| * | | | | | | | | | | Convert most User model specs to use `:empty_project`Robert Speicher2017-01-191-45/+39
| * | | | | | | | | | | Convert most Project model specs to use `:empty_project`Robert Speicher2017-01-191-54/+54
* | | | | | | | | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-2020-45/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Renamed a file to make the transition to EE easierJose Ivan Vargas2017-01-192-2/+2
| * | | | | | | | | | | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pagesJose Ivan Vargas2017-01-184-10/+8