summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fixed search component not instantiating back when pressing the back button ↵26623-search-bar-dropdown-doesn-t-load-when-you-go-back-in-browser-historyJose Ivan Vargas2017-01-201-0/+10
| | | | on the issue page
* Merge branch 'keep_mini_graph_down_pipelines_index' into 'master' Fatih Acet2017-01-201-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_indexRegis2017-01-2025-136/+249
| |\
| * | 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 ↵Regis2017-01-191-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 Gray2017-01-204-4/+42
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 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-overflowAnnabel Dunstone Gray2017-01-192-2/+2
| | |
| * | Use flexbox instead of media queriesFilipa Lacerda2017-01-193-74/+36
| | | | | | | | | | | | Move CSS to correct file
| * | 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-192-3/+75
| | | | | | | | | | | | 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-timeRémy Coutable2017-01-202-3/+13
|\ \ \ | | | | | | | | | | | | | | | | Fix shared runners queue update See merge request !8663
| * | | Add missing specs for update build queue servicefix-shared-runners-queue-updateGrzegorz Bizon2017-01-201-1/+3
| | | |
| * | | 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-201-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix participants margins to fit on one line See merge request !8640
| * | | | Fix participants margins to fit on one lineparticipants-listAnnabel Dunstone Gray2017-01-191-0/+4
| | | | |
* | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-201-40/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't persist application settings in test env See merge request !8573
| * | | | | Move default values to ApplicationSetting::DEFAULTS and use it in ↵Rémy Coutable2017-01-151-40/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CurrentSettings Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' Yorick Peterse2017-01-201-1/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-dayAdam Niedzielski2017-01-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitlab::ExclusiveLease to make sure that we enqueue Sidekiq job at most once per day for given key.
* | | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-2010-26/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
| * | | | | 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-181-4/+2
| | | | | |
| * | | | | Removed the index action from both the projects hook and services controllersJose Ivan Vargas2017-01-182-9/+2
| | | | | |
| * | | | | Corrected code style and titlesJose Ivan Vargas2017-01-184-4/+3
| | | | | |
| * | | | | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-182-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Added a test for the integrations controller
| * | | | | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-188-14/+31
| | | | | |
* | | | | | Merge branch '21698-redis-runner-last-build' into 'master' Kamil Trzciński2017-01-204-0/+58
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Reduce DB-load for build-queues by storing last_update in Redis See merge request !8084
| * | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-19202-1027/+1125
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fix specsKamil Trzcinski2017-01-192-4/+10
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-19833-4775/+12378
| |\ \ \ \ \
| * | | | | | Fixed broken buildKim "BKC" Carlbäcker2016-12-212-2/+2
| | | | | | |
| * | | | | | Change name of expire constantKim "BKC" Carlbäcker2016-12-161-3/+3
| | | | | | |
| * | | | | | Make expire-time a constant, correct function in ServiceKim "BKC" Carlbäcker2016-12-162-3/+4
| | | | | | |
| * | | | | | Use Token instead of IDKim "BKC" Carlbäcker2016-12-161-1/+1
| | | | | | |
| * | | | | | Do things in the correct orderKim "BKC" Carlbäcker2016-12-161-0/+1
| | | | | | |
| * | | | | | Don't use redis.multiKim "BKC" Carlbäcker2016-12-161-9/+3
| | | | | | |
| * | | | | | Make ensure_runner_queue_value atomicKim "BKC" Carlbäcker2016-12-161-5/+7
| | | | | | |
| * | | | | | #NamingThingsKim "BKC" Carlbäcker2016-12-163-8/+17
| | | | | | |
| * | | | | | Update Runners in a ServiceKim "BKC" Carlbäcker2016-12-152-15/+13
| | | | | | |
| * | | | | | Move redis-logic into Ci::RunnerKim "BKC" Carlbäcker2016-12-151-0/+16
| | | | | | |
| * | | | | | lintingKim "BKC" Carlbäcker2016-12-151-1/+1
| | | | | | |
| * | | | | | Use correct variablesKim "BKC" Carlbäcker2016-12-141-1/+1
| | | | | | |
| * | | | | | typo-oKim "BKC" Carlbäcker2016-12-141-1/+1
| | | | | | |
| * | | | | | This is needed as well...Kim "BKC" Carlbäcker2016-12-141-1/+8
| | | | | | |
| * | | | | | Add BuildQueueWorker for injecting redis-keysKim "BKC" Carlbäcker2016-12-142-0/+24
| | | | | | |
* | | | | | | Merge branch '26066-wrong-messsage-for-unregistered-u2f-device-on-sign-in' ↵Fatih Acet2017-01-193-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' New U2F ineligible message Closes #26066 See merge request !8392